From eaccbd2cd026dc5a0874c083f375762e8a30deb3 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 30 Oct 2024 08:08:04 +0100
Subject: [PATCH] CI: Stop running py38, add py312

Python 3.8 is end of life and jobs started to fail.

Bump hacking to latest 7.0.0 as well, since currently pinned
version does not support python 3.9+

Depends-On: https://review.opendev.org/c/openstack/magnum/+/936751

Change-Id: If230a819c90e2ff29e38e141943ec2060562a1df
---
 .zuul.yaml            | 18 +++++++++---------
 test-requirements.txt |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 73b64b7..e306a1b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,18 +18,15 @@
       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.
-      py38 is in Zed/2023.1/2023.2/2024.1 PTI
       py39 is in Zed/2023.2/2024.1 PTI
       py310 is in 2023.1/2023.2/2024.1 PTI
-      py311 is in 2024.1 PTI
+      py311 is in 2024.1/2024.2 PTI
+      py312 is in 2025.1 PTI
     check:
       jobs:
         - openstack-tox-pep8:
             required-projects:
               - openstack/magnum
-        - openstack-tox-py38:
-            required-projects:
-              - openstack/magnum
         - openstack-tox-py39:
             required-projects:
               - openstack/magnum
@@ -39,14 +36,14 @@
         - openstack-tox-py311:
             required-projects:
               - openstack/magnum
+        - openstack-tox-py312:
+            required-projects:
+              - openstack/magnum
     gate:
       jobs:
         - openstack-tox-pep8:
             required-projects:
               - openstack/magnum
-        - openstack-tox-py38:
-            required-projects:
-              - openstack/magnum
         - openstack-tox-py39:
             required-projects:
               - openstack/magnum
@@ -56,6 +53,9 @@
         - openstack-tox-py311:
             required-projects:
               - openstack/magnum
+        - openstack-tox-py312:
+            required-projects:
+              - openstack/magnum
     post:
       jobs:
         - publish-openstack-python-branch-tarball
@@ -66,4 +66,4 @@
       - openstack-cover-jobs-magnum
       - openstack-python3-jobs-magnum
       - release-notes-jobs-python3
-      - publish-openstack-docs-pti
\ No newline at end of file
+      - publish-openstack-docs-pti
diff --git a/test-requirements.txt b/test-requirements.txt
index e9dc685..445e8c7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.0,<3.1 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD