From b8d5d40f2447b9112bb67944f9e48411095791d8 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 28 Aug 2025 08:24:05 +0200 Subject: [PATCH] CI: Fix py39 testing, add py313 master requirements and magnum branches dropped py39 support Change-Id: Ice70b4d3331f7cc888e3e9185cc8b326d0c2da89 Signed-off-by: Michal Nasiadka --- .zuul.yaml | 25 +++++++++++++++++++------ tox.ini | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e306a1b..213c235 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -18,10 +18,11 @@ but with magnum added as a required-projects. This checks out the project code and allows tox_install_siblings to use magnum when building the venv. - py39 is in Zed/2023.2/2024.1 PTI - py310 is in 2023.1/2023.2/2024.1 PTI - py311 is in 2024.1/2024.2 PTI - py312 is in 2025.1 PTI + py39 is in Zed/2023.2/2024.1/2024.2/2025.1 PTI + py310 is in 2023.1/2023.2/2024.1/2024.2/2025.1/2025.2/2026.1 PTI + py311 is in 2024.1/2024.2/2025.1/2025.2/2026.1 PTI + py312 is in 2025.1/2025.2/2026.1 PTI + py313 is in 2025.2/2026.1 PTI check: jobs: - openstack-tox-pep8: @@ -29,7 +30,10 @@ - openstack/magnum - openstack-tox-py39: required-projects: - - openstack/magnum + - name: openstack/magnum + override-checkout: stable/2025.1 + - name: openstack/requirements + override-checkout: stable/2025.1 - openstack-tox-py310: required-projects: - openstack/magnum @@ -39,6 +43,9 @@ - openstack-tox-py312: required-projects: - openstack/magnum + - openstack-tox-py313: + required-projects: + - openstack/magnum gate: jobs: - openstack-tox-pep8: @@ -46,7 +53,10 @@ - openstack/magnum - openstack-tox-py39: required-projects: - - openstack/magnum + - name: openstack/magnum + override-checkout: stable/2025.1 + - name: openstack/requirements + override-checkout: stable/2025.1 - openstack-tox-py310: required-projects: - openstack/magnum @@ -56,6 +66,9 @@ - openstack-tox-py312: required-projects: - openstack/magnum + - openstack-tox-py313: + required-projects: + - openstack/magnum post: jobs: - publish-openstack-python-branch-tarball diff --git a/tox.ini b/tox.ini index e1fd4ee..c7078ed 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 -deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} +deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs}