From 184ff54a2a9856d79573b0b7ee124e34c8b73e27 Mon Sep 17 00:00:00 2001
From: saaj <id@saaj.me>
Date: Wed, 23 Aug 2023 15:30:57 +0200
Subject: [PATCH] Update Pythons, pin Ubuntu and service database images

---
 .github/workflows/tox.yml | 12 ++++++------
 setup.py                  |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 9f28e2b3..2bed2b59 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -7,13 +7,13 @@ on:
       - master
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.10"]
     services:
       mariadb:
-        image: mariadb
+        image: mariadb:10.11
         env:
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
           MARIADB_DATABASE: test
@@ -21,7 +21,7 @@ jobs:
           - 3307:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
       mysql:
-        image: mysql
+        image: mysql:8.1
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: test
@@ -29,7 +29,7 @@ jobs:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
       postgres:
-        image: postgres
+        image: postgres:15.4
         env:
           POSTGRES_PASSWORD: test
           POSTGRES_USER: test
@@ -44,7 +44,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install lxml dependencies
-      if: ${{ matrix.python-version == 'pypy-3.7' }}
+      if: ${{ matrix.python-version == 'pypy-3.10' }}
       run: |
         sudo apt-get install libxml2-dev libxslt-dev
     - name: Install dependencies
diff --git a/setup.py b/setup.py
index edad9d65..01e11cdd 100644
--- a/setup.py
+++ b/setup.py
@@ -53,11 +53,10 @@ def get_file_contents(filename):
         'Intended Audience :: Information Technology',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        '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',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet',
         'Topic :: Security',