From 0c5c5871fe0a05ea78e19a796ec601bb85232fea Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 1 Dec 2022 11:52:18 +1100
Subject: [PATCH] Drop Python < 3.8, add Python 3.10 testing

Also update the integration job to Jammy, and update to the latest
ansible in Zuul.

Change-Id: Idec1941f6879a0fabee8fac637bc1a43e0acd793
---
 .zuul.yaml                | 14 +++++---------
 setup.cfg                 |  5 +----
 tools/docker-compose.yaml |  2 +-
 tox.ini                   |  2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8f7b1c2..e76591d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - job:
     name: gerritlib-jeepyb-integration
     description: Run manage_projects with gerritlib from source against Gerrit
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     pre-run: playbooks/jeepyb-integration/pre.yaml
     run: playbooks/jeepyb-integration/run.yaml
     post-run: playbooks/jeepyb-integration/post.yaml
@@ -13,22 +13,18 @@
     check:
       jobs:
         - gerritlib-jeepyb-integration
-        - tox-py36:
-            nodeset: ubuntu-bionic
-        - tox-py37:
-            nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
         - tox-py39:
             nodeset: ubuntu-focal
+        - tox-py310:
+            nodeset: ubuntu-jammy
     gate:
       jobs:
         - gerritlib-jeepyb-integration
-        - tox-py36:
-            nodeset: ubuntu-bionic
-        - tox-py37:
-            nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
         - tox-py39:
             nodeset: ubuntu-focal
+        - tox-py310:
+            nodeset: ubuntu-jammy
diff --git a/setup.cfg b/setup.cfg
index 5394879..b44d1f2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,13 +17,10 @@ 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.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [files]
 packages = gerritlib
diff --git a/tools/docker-compose.yaml b/tools/docker-compose.yaml
index c872828..5b6f52d 100644
--- a/tools/docker-compose.yaml
+++ b/tools/docker-compose.yaml
@@ -29,4 +29,4 @@ services:
       - "./playbooks/:/var/playbooks/:z"
     # NOTE(pabelanger): Be sure to update this line each time we change the
     # default version of ansible for Zuul.
-    command: "/usr/local/lib/zuul/ansible/2.8/bin/ansible-playbook /var/playbooks/setup.yaml"
+    command: "/usr/local/lib/zuul/ansible/6/bin/ansible-playbook /var/playbooks/setup.yaml"
diff --git a/tox.ini b/tox.ini
index 0970718..9653942 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ minversion = 1.6
 skipsdist = True
 skip_missing_interpreters = false
 # https://docs.python.org/devguide/#status-of-python-branches
-envlist = pep8, py{39,38,37,36,27,py}
+envlist = pep8, py{310,39,38,py}
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}