Attachment 229259 Details for Bug 258033 – py-b2sdk-1.12.0-revised.patch

[patch] py-b2sdk-1.12.0-revised.patch

py-b2sdk-1.12.0-revised.patch (text/plain), 4.32 KB, created by Kai Knoblich on 2021-11-04 06:41:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2021-11-04 06:41:23 UTC

Size: 4.32 KB

patch

obsolete

>diff --git a/devel/py-b2sdk/Makefile b/devel/py-b2sdk/Makefile
>index 18ebeba67ad6..7442cc8327c4 100644
>--- a/devel/py-b2sdk/Makefile
>+++ b/devel/py-b2sdk/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	b2sdk
>-DISTVERSION=	1.6.0
>+DISTVERSION=	1.12.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,28 +12,36 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2:devel/py-logfury@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2<0.2.0:devel/py-logfury@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1<3.0.0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0:misc/py-tqdm@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0<5.0.0:misc/py-tqdm@${PY_FLAVOR}
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pytest-lazy-fixture>0:devel/py-pytest-lazy-fixture@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR}
> 
> USES=		python:3.6+
>-USE_PYTHON=	distutils autoplist concurrent
>+USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
>+
> .include <bsd.port.pre.mk>
> 
> .if ${PYTHON_REL} < 30800
>-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.3.0:devel/py-importlib-metadata@${PY_FLAVOR}
> .endif
> 
>+# Skip some tests as they either require the environment variable
>+# B2_TEST_APPLICATION_KEY_ID set or a relative path regarding the filenames in
>+# the file headers.
> do-test:
>-	@cd ${WRKSRC} && ${TOUCH} ${WRKSRC}/test/__init__.py && \
>-	${PYTHON_CMD} ${PYDISTUTILS_SETUP} nosetests
>+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -k '\
>+		not test_files_headers and \
>+		not test_large_file and \
>+		not test_raw_api'
> 
> .include <bsd.port.post.mk>
>diff --git a/devel/py-b2sdk/distinfo b/devel/py-b2sdk/distinfo
>index 06e5ace17a6d..997059b82e70 100644
>--- a/devel/py-b2sdk/distinfo
>+++ b/devel/py-b2sdk/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1618967564
>-SHA256 (b2sdk-1.6.0.tar.gz) = e9f8eb7ae3140b4e7a96375d7c089d7c16c992f1039dd07f748931d5b17b79fb
>-SIZE (b2sdk-1.6.0.tar.gz) = 218801
>+TIMESTAMP = 1629760684
>+SHA256 (b2sdk-1.12.0.tar.gz) = 3ec2264ae2b421563d130a4b2a53f96454ba03b8f68893ad520fc651c413251d
>+SIZE (b2sdk-1.12.0.tar.gz) = 273412
>diff --git a/devel/py-b2sdk/files/patch-requirements.txt b/devel/py-b2sdk/files/patch-requirements.txt
>new file mode 100644
>index 000000000000..32f7f4a05a2b
>--- /dev/null
>+++ b/devel/py-b2sdk/files/patch-requirements.txt
>@@ -0,0 +1,10 @@
>+Relax requirements for devel/py-arrow
>+
>+--- requirements.txt.orig	2021-08-06 12:04:59 UTC
>++++ requirements.txt
>+@@ -1,4 +1,4 @@
>+-arrow>=0.8.0,<1.0.0
>++arrow>=0.8.0
>+ importlib-metadata>=2.1.1,<3.0.0; python_version <= '3.5'
>+ importlib-metadata>=3.3.0; python_version > '3.5' and python_version < '3.8'
>+ logfury>=0.1.2,<0.2.0
>diff --git a/devel/py-b2sdk/files/patch-setup.py b/devel/py-b2sdk/files/patch-setup.py
>new file mode 100644
>index 000000000000..cad342d6a99a
>--- /dev/null
>+++ b/devel/py-b2sdk/files/patch-setup.py
>@@ -0,0 +1,14 @@
>+Relax requirements for devel/py-setuptools_scm.  Python 3.5 is no longer
>+present in the Ports tree.
>+
>+--- setup.py.orig	2021-08-06 12:04:59 UTC
>++++ setup.py
>+@@ -111,7 +111,7 @@ setup(
>+                 'sadisplay'
>+             ],
>+     },
>+-    setup_requires=['setuptools_scm<6.0'],  # setuptools_scm>=6.0 doesn't support Python 3.5
>++    setup_requires=['setuptools_scm'],  # setuptools_scm>=6.0 doesn't support Python 3.5
>+     use_scm_version=True,
>+ 
>+     # If there are data files included in your packages that need to be

Actions: View | Diff

Attachments on bug 258033: 227417 | 227418 | 227419 | 229259