Date: Mon, 3 Apr 2023 15:22:07 GMT From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0780a2be805d - main - devel/py-stevedore: Update to 5.0.0 Message-ID: <202304031522.333FM7C7028483@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=0780a2be805d9d57d0e395ab62eceac005940bf4 commit 0780a2be805d9d57d0e395ab62eceac005940bf4 Author: Nicola Vitale <nivit@FreeBSD.org> AuthorDate: 2023-04-03 15:16:49 +0000 Commit: Nicola Vitale <nivit@FreeBSD.org> CommitDate: 2023-04-03 15:16:49 +0000 devel/py-stevedore: Update to 5.0.0 - Add a set of patches for supporting Python 3.7 until 2023-06-27 when lang/python37 expires. [1] Those patches are taken from: https ://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 PR: 270608 Reported by: Jonathan Chen <jonc@chen.org.nz> [1] --- devel/py-stevedore/Makefile | 4 ++-- devel/py-stevedore/distinfo | 6 +++--- .../py-stevedore/files/patch-stevedore___cache.py | 25 ++++++++++++++++++++++ .../files/patch-stevedore_tests_test__driver.py | 18 ++++++++++++++++ .../files/patch-stevedore_tests_test__extension.py | 21 ++++++++++++++++++ .../files/patch-stevedore_tests_test__sphinxext.py | 18 ++++++++++++++++ 6 files changed, 87 insertions(+), 5 deletions(-) diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile index 32fe1df61a5a..ea1bf82cd33c 100644 --- a/devel/py-stevedore/Makefile +++ b/devel/py-stevedore/Makefile @@ -1,5 +1,5 @@ PORTNAME= stevedore -PORTVERSION= 4.1.1 +PORTVERSION= 5.0.0 CATEGORIES= devel MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} -USES= python:3.6+ +USES= python:3.7+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-stevedore/distinfo b/devel/py-stevedore/distinfo index 171f5b28be98..4143abb1c0ed 100644 --- a/devel/py-stevedore/distinfo +++ b/devel/py-stevedore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668701939 -SHA256 (stevedore-4.1.1.tar.gz) = 7f8aeb6e3f90f96832c301bff21a7eb5eefbe894c88c506483d355565d88cc1a -SIZE (stevedore-4.1.1.tar.gz) = 514168 +TIMESTAMP = 1680530853 +SHA256 (stevedore-5.0.0.tar.gz) = 2c428d2338976279e8eb2196f7a94910960d9f7ba2f41f3988511e95ca447021 +SIZE (stevedore-5.0.0.tar.gz) = 513970 diff --git a/devel/py-stevedore/files/patch-stevedore___cache.py b/devel/py-stevedore/files/patch-stevedore___cache.py new file mode 100644 index 000000000000..06603464868e --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore___cache.py @@ -0,0 +1,25 @@ +--- stevedore/_cache.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/_cache.py +@@ -15,7 +15,6 @@ + import errno + import glob + import hashlib +-import importlib.metadata as importlib_metadata + import itertools + import json + import logging +@@ -24,6 +23,14 @@ import os.path + import struct + import sys + ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + log = logging.getLogger('stevedore._cache') + diff --git a/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py b/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py new file mode 100644 index 000000000000..060dcc05a802 --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py @@ -0,0 +1,18 @@ +--- stevedore/tests/test_driver.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/tests/test_driver.py +@@ -13,7 +13,14 @@ + """Tests for stevedore.extension + """ + +-import importlib.metadata as importlib_metadata ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + from stevedore import driver + from stevedore import exception diff --git a/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py b/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py new file mode 100644 index 000000000000..8e0fe752efb9 --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py @@ -0,0 +1,21 @@ +--- stevedore/tests/test_extension.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/tests/test_extension.py +@@ -13,9 +13,17 @@ + """Tests for stevedore.extension + """ + +-import importlib.metadata as importlib_metadata + import operator + from unittest import mock ++ ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + from stevedore import exception + from stevedore import extension diff --git a/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py b/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py new file mode 100644 index 000000000000..6801a1325adf --- /dev/null +++ b/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py @@ -0,0 +1,18 @@ +--- stevedore/tests/test_sphinxext.py.orig 2023-02-10 18:29:38 UTC ++++ stevedore/tests/test_sphinxext.py +@@ -12,7 +12,14 @@ + """Tests for the sphinx extension + """ + +-import importlib.metadata as importlib_metadata ++# only until 2023-06-23 when lang/python37 expires ++# https://opendev.org/openstack/stevedore/commit/ccd17543a37143913e886f9306be10d40260fdf3 ++try: ++ # For python 3.8 and later ++ import importlib.metadata as importlib_metadata ++except ImportError: ++ # For everyone else ++ import importlib_metadata + + from stevedore import extension + from stevedore import sphinxext
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304031522.333FM7C7028483>