Merge pull request #138 from stackhpc/upstream/master-2025-11-03

Synchronise master with upstream

Author: priteau

.zuul.d/project-template.yaml

@@ -42,6 +42,7 @@
       - ^.*requirements-py[2,3].txt$
       - ^doc/requirements.txt$
       - ^lower-constraints.txt$
+      - ^pyproject.toml$
 
 - job:
     name: requirements-check-self

babel-test/babel-input.py

@@ -13,7 +13,6 @@
 
 """Test input for Babel"""
 
-
 from oslo.i18n import _
 from oslo.i18n import _LE
 from oslo_log import log as logging

denylist.txt

@@ -50,6 +50,31 @@ molecule-plugins
 # Once any stable branch move to 'Extended Maintenance' and we pin the
 # older Tempest to test them then we can move it from here to u-c file.
 tempest
+barbican_tempest_plugin
+blazar_tempest_plugin
+cinder_tempest-plugin
+cloudkitty_tempest_plugin
+cyborg_tempest-plugin
+designate_tempest-plugin
+freezer_tempest_plugin
+glance_tempest-plugin
+heat_tempest-plugin
+ironic_tempest-plugin
+keystone_tempest_plugin
+magnum_tempest_plugin
+manila_tempest-plugin
+mistral_tempest_tests
+monasca_tempest-plugin
+neutron_tempest-plugin
+octavia_tempest-plugin
+telemetry_tempest_plugin
+trove_tempest_plugin
+venus_tempest-plugin
+vitrage_tempest-plugin
+watcher_tempest-plugin
+whitebox_tempest-plugin
+zaqar_tempest_plugin
+zun_tempest-plugin
 
 # annoying from setuptools
 pkg_resources

detail.py

@@ -20,72 +20,77 @@
 import urllib.parse as urlparse
 import urllib.request as urlreq
 
-import pkg_resources
+import packaging.requirement
 
 try:
     PYPI_LOCATION = os.environ['PYPI_LOCATION']
 except KeyError:
     PYPI_LOCATION = 'http://pypi.org/project'
 
 
-KEEP_KEYS = frozenset([
-    'author',
-    'author_email',
-    'maintainer',
-    'maintainer_email',
-    'license',
-    'summary',
-    'home_page',
-])
+KEEP_KEYS = frozenset(
+    [
+        'author',
+        'author_email',
+        'maintainer',
+        'maintainer_email',
+        'license',
+        'summary',
+        'home_page',
+    ]
+)
 
 
 def iter_names(req):
-    for k in (req.key, req.project_name):
-        yield k
-        yield k.title()
-        yield k.replace("-", "_")
-        yield k.replace("-", "_").title()
+    yield req.name
+    yield req.name.lower()
+    yield req.name.title()
+    yield req.name.replace("-", "_")
+    yield req.name.replace("-", "_").title()
 
 
 def release_data(req):
     # Try to find it with various names...
     attempted = []
     for name in iter_names(req):
-        url = PYPI_LOCATION + "/%s/json" % (urlparse.quote(name))
+        url = PYPI_LOCATION + f"/{urlparse.quote(name)}/json"
         if url in attempted:
             continue
         with contextlib.closing(urlreq.urlopen(url)) as uh:
             if uh.getcode() != 200:
                 attempted.append(url)
                 continue
             return json.loads(uh.read())
-    attempted = [" * %s" % u for u in attempted]
-    raise IOError("Could not find '%s' on pypi\nAttempted urls:\n%s"
-                  % (req.key, "\n".join(attempted)))
+    attempted = [f" * {u}" for u in attempted]
+    raise OSError(
+        "Could not find '{}' on pypi\nAttempted urls:\n{}".format(
+            req.key, "\n".join(attempted)
+        )
+    )
 
 
 def main():
     if len(sys.argv) == 1:
-        print("%s requirement-file ..." % (sys.argv[0]), file=sys.stderr)
+        print(f"{sys.argv[0]} requirement-file ...", file=sys.stderr)
         sys.exit(1)
     for filename in sys.argv[1:]:
-        print("Analyzing file: %s" % (filename))
+        print(f"Analyzing file: {filename}")
         details = {}
         with open(filename, "rb") as fh:
             for line in fh.read().splitlines():
                 line = line.strip()
                 if line.startswith("#") or not line:
                     continue
-                req = pkg_resources.Requirement.parse(line)
-                print(" - processing: %s" % (req))
+                req = packaging.requirement.Requirement(line)
+                print(f" - processing: {req}")
                 try:
                     raw_req_data = release_data(req)
-                except IOError:
+                except OSError:
                     traceback.print_exc()
                     details[req.key] = None
                 else:
                     req_info = {}
-                    for (k, v) in raw_req_data.get('info', {}).items():
+                    for k, v in raw_req_data.get('info', {}).items():
                         if k not in KEEP_KEYS:
                             continue
                         req_info[k] = v
@@ -94,9 +99,12 @@ def main():
                         'info': req_info,
                     }
         filename, _ext = os.path.splitext(filename)
-        with open("%s.json" % (filename), "wb") as fh:
-            fh.write(json.dumps(details, sort_keys=True, indent=4,
-                                separators=(",", ": ")))
+        with open(f"{filename}.json", "wb") as fh:
+            fh.write(
+                json.dumps(
+                    details, sort_keys=True, indent=4, separators=(",", ": ")
+                )
+            )
 
 
 if __name__ == '__main__':