Merge pull request #210 from stackhpc/upstream/master-2026-07-06

Synchronise master with upstream

Author: priteau

openstack_requirements/check.py

@@ -111,8 +111,8 @@ def process(self, strict: bool = True) -> None:
         for fname, extras in self.project['extras'].items():
             print(f"Processing {fname} (extras)")
             for name, content in extras.items():
-                print(f"  Processing .[{name}]")
-                self.reqs_by_file[f'{fname} (.[{name}] extra)'] = (
+                print(f"  Processing {name!r} extra")
+                self.reqs_by_file[f'{fname} ({name!r} extra)'] = (
                     self.extract_reqs(content, strict)
                 )
 

openstack_requirements/tests/test_check.py

@@ -43,11 +43,11 @@ def test_extras__setup_cfg(self):
         req_list = check.RequirementsList('test-project', project_data)
         req_list.process(strict=False)
 
-        self.assertIn('setup.cfg (.[test] extra)', req_list.reqs_by_file)
-        self.assertIn('setup.cfg (.[dev] extra)', req_list.reqs_by_file)
+        self.assertIn("setup.cfg ('test' extra)", req_list.reqs_by_file)
+        self.assertIn("setup.cfg ('dev' extra)", req_list.reqs_by_file)
 
-        test_reqs = req_list.reqs_by_file['setup.cfg (.[test] extra)']
-        dev_reqs = req_list.reqs_by_file['setup.cfg (.[dev] extra)']
+        test_reqs = req_list.reqs_by_file["setup.cfg ('test' extra)"]
+        dev_reqs = req_list.reqs_by_file["setup.cfg ('dev' extra)"]
 
         self.assertEqual(2, len(test_reqs))
         self.assertIn('pytest', test_reqs)

projects.txt

@@ -187,7 +187,6 @@ openstack/python-openstackclient
 openstack/python-swiftclient
 openstack/python-tackerclient
 openstack/python-troveclient
-openstack/python-vitrageclient
 openstack/python-watcherclient
 openstack/python-zaqarclient
 openstack/python-zunclient
@@ -206,8 +205,6 @@ openstack/tosca-parser
 openstack/trove
 openstack/trove-tempest-plugin
 openstack/virtualbmc
-openstack/vitrage
-openstack/vitrage-tempest-plugin
 openstack/watcher
 openstack/watcher-dashboard
 openstack/watcher-tempest-plugin