From baded65065710a22adfd2f2e7e47368b6197590a Mon Sep 17 00:00:00 2001
From: Frank Sachsenheim <funkyfuture@riseup.net>
Date: Sat, 22 Jul 2023 15:14:57 +0200
Subject: [PATCH] Adds testing against recent Python versions

---
 .github/workflows/qa.yml |  2 ++
 README.rst               |  3 ---
 docs/contribute.rst      | 23 ++++-------------------
 setup.py                 |  7 ++-----
 tox.ini                  |  2 +-
 5 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 3f2d1872..2f9745f3 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -22,6 +22,8 @@ jobs:
           - 3.7  # 2023-06-07
           - 3.8  # 2024-10
           - 3.9  # 2025-10
+          - 3.10  # 2026-10
+          - 3.11  # 2027-10
           - pypy3.7
           - pypy3.8
           - pypy3.9
diff --git a/README.rst b/README.rst
index e9385bb0..9e58a9c5 100644
--- a/README.rst
+++ b/README.rst
@@ -23,9 +23,6 @@ yours.
 Versioning & Interpreter support
 --------------------------------
 
-The Cerberus `1.x` versions can be used with Python 2 while version `2.0` and
-later rely on Python 3 features.
-
 Starting with Cerberus 1.2, it is maintained according to
 `semantic versioning`_. So, a major release sheds off the old and defines a
 space for the new, minor releases ship further new features and improvements
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 130e752f..26f44c9b 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -24,32 +24,17 @@ that the interpreters themselves need to be available on the system.
    $ tox
 
 This might take some time the first run as the different virtual environments
-are created and dependencies are installed. If everything is ok, you will see
-the following:
-
-.. code-block:: console
-
-    _________ summary _________
-    py27: commands succeeded
-    py34: commands succeeded
-    py35: commands succeeded
-    py36: commands succeeded
-    pypy: commands succeeded
-    pypy3: commands succeeded
-    doclinks: commands succeeded
-    doctest: commands succeeded
-    linting: commands succeeded
-    congratulations :)
+are created and dependencies are installed.
 
 If something goes **wrong** and one test fails, you might need to run that test
 in the specific python version. You can use the created environments to run
-some specific tests. For example, if a test suite fails in Python 3.5:
+some specific tests. For example, if a test suite fails in Python 3.11:
 
 .. code-block:: console
 
-    $ tox -e py35
+    $ tox -e py311
 
-Have a look at ``tox.ini`` for the available test environments and their workings.
+Have a look at ``tox.ini`` for the available test environments and their setup.
 
 Using Pytest
 ~~~~~~~~~~~~
diff --git a/setup.py b/setup.py
index 8933bd08..3a30980c 100755
--- a/setup.py
+++ b/setup.py
@@ -50,15 +50,12 @@
         "License :: OSI Approved :: ISC License (ISCL)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "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 :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
diff --git a/tox.ini b/tox.ini
index 34ea6270..902e16f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py37,py38,py39,pypy3,doclinks,doctest,linting
+envlist=py37,py38,py39,py310,py311,pypy3,doclinks,doctest,linting
 
 [testenv]
 deps=pytest