From 53f1cd32d25f724cf08593fda31896a8eedac61b Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Wed, 13 Apr 2022 20:05:09 -0500
Subject: [PATCH] switch from py36/38 to py38/39

Change-Id: Idd24975afb969a9b182be9034bee4d4b019ac32b
Signed-off-by: Matthew Thode <mthode@mthode.org>
---
 .zuul.d/jobs.yaml    | 20 ++++++++++----------
 .zuul.d/project.yaml |  8 ++++----
 setup.cfg            |  2 ++
 tox.ini              | 10 +++++-----
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index ea4a24df6f..1ebca34df9 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -12,16 +12,6 @@
     vars:
       tox_envlist: babel
 
-- job:
-    name: requirements-tox-py36-check-uc
-    parent: openstack-tox-py36
-    description: |
-      Run test for requirements project.
-
-      Uses tox with the ``py36-check-uc`` environment.
-    files: ^upper-constraints.*txt$
-    vars:
-      tox_envlist: py36-check-uc
 - job:
     name: requirements-tox-py38-check-uc
     parent: openstack-tox-py38
@@ -32,6 +22,16 @@
     files: ^upper-constraints.*txt$
     vars:
       tox_envlist: py38-check-uc
+- job:
+    name: requirements-tox-py39-check-uc
+    parent: openstack-tox-py39
+    description: |
+      Run test for requirements project.
+
+      Uses tox with the ``py39-check-uc`` environment.
+    files: ^upper-constraints.*txt$
+    vars:
+      tox_envlist: py39-check-uc
 - job:
     name: requirements-tox-validate-projects
     parent: openstack-tox
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index eb50c1d2c9..3a707012b7 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -25,8 +25,8 @@
         - requirements-tox-babel
         - requirements-tox-bindep:
             voting: false
-        - requirements-tox-py36-check-uc
         - requirements-tox-py38-check-uc
+        - requirements-tox-py39-check-uc
         - requirements-tox-validate-projects:
             voting: false
         - cross-barbican-py38
@@ -50,7 +50,7 @@
         - cross-octavia-py38
         - cross-osc-tox-docs
         - cross-swift-py38
-        - openstack-tox-py36
+        - openstack-tox-py38
         - openstacksdk-functional-devstack
         - tempest-full-py3:
             irrelevant-files:
@@ -96,8 +96,8 @@
               - bindep.txt
         - openstack-tox-validate
         - requirements-tox-babel
-        - requirements-tox-py36-check-uc
         - requirements-tox-py38-check-uc
+        - requirements-tox-py39-check-uc
         - cross-cinder-py38
         - cross-designate-py38
         - cross-glance-py38
@@ -120,7 +120,7 @@
         - cross-octavia-py38
         - cross-osc-tox-docs
         - cross-swift-py38
-        - openstack-tox-py36
+        - openstack-tox-py38
         - openstacksdk-functional-devstack
         - tempest-full-py3:
             irrelevant-files:
diff --git a/setup.cfg b/setup.cfg
index 03fcfe17ba..faac7c9b16 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,8 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 67b0ff0d04..590c079283 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,13 +13,13 @@ deps = -c{toxinidir}/upper-constraints.txt
 commands =
   stestr run {posargs}
 
-[testenv:py36-check-uc]
-basepython = python3.6
+[testenv:py38-check-uc]
+basepython = python3.8
 deps = -r{toxinidir}/upper-constraints.txt
 commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
 
-[testenv:py38-check-uc]
-basepython = python3.8
+[testenv:py39-check-uc]
+basepython = python3.9
 deps = -r{toxinidir}/upper-constraints.txt
 commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
 
@@ -34,7 +34,7 @@ description = Regenerates upper-constraints.txt
 # Generate needs an unconstrained install to get new dependencies
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = generate-constraints {posargs: -b blacklist.txt -r global-requirements.txt -p python3.6 -p python3.7 -p python3.8 -p python3.9 > upper-constraints.txt}
+commands = generate-constraints {posargs: -b blacklist.txt -r global-requirements.txt -p python3.6 -p python3.7 -p python3.8 -p python3.9 -p python3.10 > upper-constraints.txt}
 
 [testenv:validate]
 commands =