From 5183d7346c738380ad73491f2af6d9eec6a6561d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 29 Aug 2025 09:54:09 -0700
Subject: [PATCH] Drop testing on Bionic and Xenial

Updates to Ansible in Zuul are dropping support for running tests with
python older than version 3.8. This is pushing us to drop testing on
Bionic and anything older. Bump up the test cases to Focal for python
3.8 and drop jobs that were running for Xenial and Bionic.

Note that this also means we drop testing for python2.7. It is possible
that we could make python2.7 testing work as Focal and Jammy include 2.7
packages. However, modern tox tooling doesn't understand running tests
under python2.7 so requires additional effort. Considering that all
modern platforms we expect to run glean on have python3 now seems like a
good time to drop 2.7 support.

Change-Id: I44ded3b66d6a5b5ade0244f1d16f3f431efb759f
---
 .zuul.yaml | 16 ++++------------
 setup.cfg  |  9 +++++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 59c585a..736aa84 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,44 +2,36 @@
     check:
       jobs:
         - tox-pep8
-        - tox-py27:
-            nodeset: ubuntu-bionic
-        - tox-py36:
-            nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
         - tox-py310:
             nodeset: ubuntu-jammy
         - tox-py311:
             nodeset: debian-bookworm
+        - tox-py312:
+            nodeset: ubuntu-noble
         - opendev-buildset-registry
         - nodepool-build-image-siblings
         - dib-nodepool-functional-openstack-gentoo-src:
             voting: false
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-ubuntu-xenial-src
-        - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src
         - dib-nodepool-functional-openstack-debian-bullseye-src
         - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
     gate:
       jobs:
         - tox-pep8
-        - tox-py27:
-            nodeset: ubuntu-bionic
-        - tox-py36:
-            nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
         - tox-py310:
             nodeset: ubuntu-jammy
         - tox-py311:
             nodeset: debian-bookworm
+        - tox-py312:
+            nodeset: ubuntu-noble
         - opendev-buildset-registry
         - nodepool-build-image-siblings
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-ubuntu-xenial-src
-        - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src
         - dib-nodepool-functional-openstack-debian-bullseye-src
         - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
diff --git a/setup.cfg b/setup.cfg
index 8ffa7b4..867e9b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,11 +13,12 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
 
 [entry_points]
 console_scripts =