Merge pull request #189 from stackhpc/upstream/2024.1-2026-05-04

Synchronise 2024.1 with upstream

Author: priteau

.zuul.d/project.yaml

@@ -3,9 +3,6 @@
       - openstack-python3-jobs
     check:
       jobs:
-        - build-wheel-cache-ubuntu-bionic:
-            files:
-              - bindep.txt
         - build-wheel-cache-ubuntu-focal:
             files:
               - bindep.txt
@@ -65,9 +62,6 @@
               - bindep.txt
     gate:
       jobs:
-        - build-wheel-cache-ubuntu-bionic:
-            files:
-              - bindep.txt
         - build-wheel-cache-ubuntu-focal:
             files:
               - bindep.txt

tox.ini

@@ -12,6 +12,12 @@ deps = -c{toxinidir}/upper-constraints.txt
 commands =
   stestr run {posargs}
 
+[testenv:py311]
+deps = -c{toxinidir}/upper-constraints.txt
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+       setuptools<82.0.0
+
 [testenv:py38-check-uc]
 allowlist_externals =
   check-conflicts
@@ -56,6 +62,10 @@ commands = generate-constraints {posargs: -b blacklist.txt -r global-requirement
 [testenv:validate]
 allowlist_externals =
   validate-constraints
+deps = -c{toxinidir}/upper-constraints.txt
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+       setuptools<82.0.0
 commands =
     validate-constraints {toxinidir}/global-requirements.txt {toxinidir}/upper-constraints.txt {toxinidir}/blacklist.txt