Merge pull request #198 from stackhpc/upstream/master-2026-05-21

Synchronise master with upstream

Author: priteau

.zuul.d/jobs.yaml

@@ -40,7 +40,9 @@
       Run test for requirements project.
 
       Uses tox with the ``py311-check-uc`` environment.
-    files: ^upper-constraints.*txt$
+    files:
+      - ^upper-constraints.*txt$
+      - ^tox.ini
     vars:
       tox_envlist: py311-check-uc
 - job:
@@ -50,7 +52,9 @@
       Run test for requirements project.
 
       Uses tox with the ``py312-check-uc`` environment.
-    files: ^upper-constraints.*txt$
+    files:
+      - ^upper-constraints.*txt$
+      - ^tox.ini
     vars:
       tox_envlist: py312-check-uc
 - job:
@@ -60,7 +64,9 @@
       Run test for requirements project.
 
       Uses tox with the ``py313-check-uc`` environment.
-    files: ^upper-constraints.*txt$
+    files:
+      - ^upper-constraints.*txt$
+      - ^tox.ini
     vars:
       tox_envlist: py313-check-uc
 

.zuul.d/project.yaml

@@ -14,7 +14,6 @@
         - requirements-tox-babel
         - requirements-tox-bindep:
             voting: false
-        - requirements-tox-py310-check-uc
         - requirements-tox-py311-check-uc
         - requirements-tox-py312-check-uc
         - requirements-tox-py313-check-uc
@@ -74,7 +73,6 @@
         - openstack-tox-validate
         - requirements-check-self
         - requirements-tox-babel
-        - requirements-tox-py310-check-uc
         - requirements-tox-py311-check-uc
         - requirements-tox-py312-check-uc
         - requirements-tox-py313-check-uc

denylist.txt

@@ -10,6 +10,7 @@ flake8-import-order
 flake8-logging-format
 hacking
 isort
+librt
 mccabe
 mypy
 pep257

global-requirements.txt

@@ -46,7 +46,7 @@ defusedxml  # PSF
 django-compressor  # MIT
 django-debreach  # BSD
 django-formtools  # BSD
-Django<4.3  # BSD
+Django<6  # BSD
 # eventlet is not compatibile with 2.0.0: https://github.com/eventlet/eventlet/issues/619
 dnspython!=2.0.0,!=2.2.0  # http://www.dnspython.org/LICENSE
 dogpile.cache!=0.9.1,!=1.1.7  # BSD
@@ -225,7 +225,6 @@ bashate  # Apache-2.0
 beartype  # MIT
 coverage!=4.4  # Apache-2.0
 ddt  # MIT
-django-nose  # BSD
 docker  # Apache-2.0
 fixtures  # Apache-2.0/BSD
 freezegun  # Apache-2.0
@@ -240,7 +239,6 @@ mock!=4.0.0,!=4.0.1  # BSD
 moto  # Apache-2.0
 mypy  # MIT
 nodeenv  # BSD
-nose  # LGPL
 openstack-doc-tools  # Apache-2.0
 os-testr  # Apache-2.0
 oslotest  # Apache-2.0

pyproject.toml

@@ -11,16 +11,14 @@ authors = [
 readme = {file = "README.rst", content-type = "text/x-rst"}
 license = {text = "Apache-2.0"}
 dynamic = ["version", "dependencies"]
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 classifiers = [
   "Environment :: OpenStack",
   "Intended Audience :: Developers",
   "License :: OSI Approved :: Apache Software License",
   "Operating System :: POSIX :: Linux",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",

tox.ini

@@ -11,12 +11,7 @@ deps =
 commands =
   stestr run {posargs}
 
-[testenv:py310-check-uc]
-basepython = python3.10
-skip_install = true
-# For now we need something due to an issue in the tox_install_sibling_packages
-# AnseibleModule
-deps = setuptools
+[check-uc]
 commands = python -m pip install --dry-run -r{toxinidir}/upper-constraints.txt
 
 [testenv:py311-check-uc]
@@ -25,23 +20,23 @@ skip_install = true
 # For now we need something due to an issue in the tox_install_sibling_packages
 # AnseibleModule
 deps = setuptools
-commands = {[testenv:py310-check-uc]commands}
+commands = {[check-uc]commands}
 
 [testenv:py312-check-uc]
 basepython = python3.12
 skip_install = true
 # For now we need something due to an issue in the tox_install_sibling_packages
 # AnseibleModule
 deps = setuptools
-commands = {[testenv:py310-check-uc]commands}
+commands = {[check-uc]commands}
 
 [testenv:py313-check-uc]
 basepython = python3.13
 skip_install = true
 # For now we need something due to an issue in the tox_install_sibling_packages
 # AnseibleModule
 deps = setuptools
-commands = {[testenv:py310-check-uc]commands}
+commands = {[check-uc]commands}
 
 [testenv:venv]
 commands = {posargs}
@@ -54,7 +49,7 @@ description = Regenerates upper-constraints.txt
 deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-commands = generate-constraints {posargs: -d denylist.txt -r global-requirements.txt -p python3.9 -p python3.10 -p python3.11 -p python3.12 -p python3.13 > upper-constraints.txt}
+commands = generate-constraints {posargs: -d denylist.txt -r global-requirements.txt -p python3.11 -p python3.12 -p python3.13 > upper-constraints.txt}
 
 [testenv:validate]
 allowlist_externals =