6 files changed, 13 insertions, 90 deletions
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index a17d16b05a57..0d7b03c7c083 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	stevedore
-PORTVERSION=	5.4.1
+PORTVERSION=	5.5.0
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,11 +14,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # pbr is a RUN_DEPENDS too, just declared elsewhere (requirements.txt)
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234529
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197373
-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}
-
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=6.1.1:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=6.1.1:devel/py-pbr@${PY_FLAVOR}
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils pytest
+
+.if make(test)
+# tests: 91 passed, 1 skipped
+TEST_ENV=	PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+		PYTHONPATH="${STAGEDIR}${PYTHON_SITELIBDIR}"
+.endif
 
 NO_ARCH=	yes
 
diff --git a/devel/py-stevedore/distinfo b/devel/py-stevedore/distinfo
index 6064de3226b1..c450332c28c2 100644
--- a/devel/py-stevedore/distinfo
+++ b/devel/py-stevedore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741811327
-SHA256 (stevedore-5.4.1.tar.gz) = 3135b5ae50fe12816ef291baff420acb727fcd356106e3e9cbfa9e5985cd6f4b
-SIZE (stevedore-5.4.1.tar.gz) = 513858
+TIMESTAMP = 1756235659
+SHA256 (stevedore-5.5.0.tar.gz) = d31496a4f4df9825e1a1e4f1f74d19abb0154aff311c3b376fcc89dae8fccd73
+SIZE (stevedore-5.5.0.tar.gz) = 513878
diff --git a/devel/py-stevedore/files/patch-stevedore___cache.py b/devel/py-stevedore/files/patch-stevedore___cache.py
deleted file mode 100644
index 06603464868e..000000000000
--- a/devel/py-stevedore/files/patch-stevedore___cache.py
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index 060dcc05a802..000000000000
--- a/devel/py-stevedore/files/patch-stevedore_tests_test__driver.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 8e0fe752efb9..000000000000
--- a/devel/py-stevedore/files/patch-stevedore_tests_test__extension.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 6801a1325adf..000000000000
--- a/devel/py-stevedore/files/patch-stevedore_tests_test__sphinxext.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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