View | Details | Raw Unified | Return to bug 276374 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/oci-cli/Makefile (-2 / +2 lines)
Lines 1-5 Link Here
1 
PORTNAME=	oci-cli
 1 
PORTNAME=	oci-cli
2 
DISTVERSION=	3.37.4
 2 
DISTVERSION=	3.37.5
3 
CATEGORIES=	devel
 3 
CATEGORIES=	devel
4 
MASTER_SITES=	PYPI
 4 
MASTER_SITES=	PYPI
5 
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 5 
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 21-27 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \ Link Here
21 
		${PYTHON_PKGNAMEPREFIX}click>=8.0.4:devel/py-click@${PY_FLAVOR} \
 21 
		${PYTHON_PKGNAMEPREFIX}click>=8.0.4:devel/py-click@${PY_FLAVOR} \
22 
		${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \
 22 
		${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \
23 
		${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \
 23 
		${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \
24 
		${PYTHON_PKGNAMEPREFIX}oci>=2.119.0:devel/py-oci@${PY_FLAVOR} \
 24 
		${PYTHON_PKGNAMEPREFIX}oci>=2.119.1:devel/py-oci@${PY_FLAVOR} \
25 
		${PYTHON_PKGNAMEPREFIX}openssl>=22.1.0:security/py-openssl@${PY_FLAVOR} \
 25 
		${PYTHON_PKGNAMEPREFIX}openssl>=22.1.0:security/py-openssl@${PY_FLAVOR} \
26 
		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
 26 
		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
27 
		${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \
 27 
		${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \
(-)b/devel/oci-cli/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1 
TIMESTAMP = 1705410474
 1 
TIMESTAMP = 1705999452
2 
SHA256 (oci-cli-3.37.4.tar.gz) = f0e2a1254b2666f8e9356aa0c9f5691bbac574815a8de14f1cd397ed474ce196
 2 
SHA256 (oci-cli-3.37.5.tar.gz) = 7b7d8b820e3c7a69cad1a0d28e3f3369978e258ef38806fcd5917bfb03ead773
3 
SIZE (oci-cli-3.37.4.tar.gz) = 15619605
 3 
SIZE (oci-cli-3.37.5.tar.gz) = 15701514
(-)a/devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py (-19 lines)
Removed Link Here
1 
--- services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py.orig	2023-06-07 19:09:16 UTC
2 
+++ services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py
3 
@@ -11,6 +11,7 @@ import os.path
4 
 import math
5 
 import os
6 
 import os.path
7 
+import shutil
8 
 import stat
9 
 import sys
10 
 from mimetypes import guess_type
11 
@@ -3079,7 +3080,7 @@ def _get_progress_bar_label(original_label, object_nam
12 
     else:
13 
         # If the names are too long then we can end up with multiple progress bars since we overflow a single line. To prevent
14 
         # this, make sure that the label won't consume more than half the terminal width
15 
-        terminal_width = click.termui.get_terminal_size()[0] / 2
16 
+        terminal_width = shutil.get_terminal_size()[0] / 2
17 
         remaining_width = terminal_width - (len(prefix) + 1)
18
19 
         if len(object_name) > remaining_width:
(-)b/devel/py-oci/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1 
PORTNAME=	oci
 1 
PORTNAME=	oci
2 
DISTVERSION=	2.119.0
 2 
DISTVERSION=	2.119.1
3 
CATEGORIES=	devel python
 3 
CATEGORIES=	devel python
4 
MASTER_SITES=	PYPI
 4 
MASTER_SITES=	PYPI
5 
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 5 
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
(-)b/devel/py-oci/distinfo (-4 / +3 lines)
Lines 1-3 Link Here
1 
TIMESTAMP = 1705410434
 1 
TIMESTAMP = 1705999369
2 
SHA256 (oci-2.119.0.tar.gz) = 9483dcac110dbebfc04e01df2408165eb06878a6dfc2ef48d4157e6ede917ffe
 2 
SHA256 (oci-2.119.1.tar.gz) = 992df963382f378b93634826956677f3c13407ca1b828c4eaf1cfd18f19fae33
3 
SIZE (oci-2.119.0.tar.gz) = 12136612
 3 
SIZE (oci-2.119.1.tar.gz) = 12201626
4 
-

Return to bug 276374