From 5cc79151a28b7559a2ec3e46bd05d2cb4c3e38d0 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Tue, 31 Oct 2023 14:51:59 +0100
Subject: [PATCH 1/2] Extend test matrix up to 3.12 and format python versions
 as strings

---
 .github/workflows/ci.yml | 39 +++++++++++++++++++++++++++++++--------
 setup.py                 |  4 ++++
 tox.ini                  |  2 +-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ecf98c9..392d97ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,13 +11,25 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy-2.7, pypy-3.7]
+        python-version: [
+          "2.7",
+          "3.5",
+          "3.6",
+          "3.7",
+          "3.8",
+          "3.9",
+          "3.10",
+          "3.11",
+          "3.12",
+          "pypy-2.7",
+          "pypy-3.7"
+        ]
         exclude:
           - os: windows-latest
-            python-version: 3.6
+            python-version: "3.6"
         include:
           - os: ubuntu-latest
-            python-version: 3.7
+            python-version: "3.7"
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python environment
@@ -65,13 +77,25 @@ jobs:
     strategy:
       matrix:
           os: [macos-latest, windows-latest]
-          python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy-2.7, pypy-3.7]
+          python-version: [
+          "2.7",
+          "3.5",
+          "3.6",
+          "3.7",
+          "3.8",
+          "3.9",
+          "3.10",
+          "3.11",
+          "3.12",
+          "pypy-2.7",
+          "pypy-3.7"
+        ]
           exclude:
             - os: windows-latest
-              python-version: 3.6
+              python-version: "3.6"
           include:
             - os: ubuntu-latest
-              python-version: 3.7
+              python-version: "3.7"
     steps: 
       - uses: actions/checkout@v2.3.4
       - name: Setup Python environment
@@ -82,8 +106,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install flake8 pytest
-          pip install -r requirements.txt
-          pip install -r test/requirements.txt
+          pip install -r requirements.txt          
           python setup.py install
       - name: Run Integration Tests
         env:
diff --git a/setup.py b/setup.py
index efbd57de..9a83842e 100644
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,10 @@
         '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 :: 3.12',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index 203030f2..0b68ed57 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 
-envlist = py{27,34,35,36,37,38,39-dev,py,py3},check,lint,docs,test_unit,coverage
+envlist = py{27,34,35,36,37,38,39,310,311,312,py,py3},check,lint,docs,test_unit,coverage
 skip_missing_interpreters = true
 
 [flake8]

From 3c5c342d05acadcc7c00dda58c57e50fe378c736 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Tue, 21 Nov 2023 10:04:59 +0100
Subject: [PATCH 2/2] Add setuptools to setup_requires and as hard dependency

---
 requirements.txt | 1 +
 setup.py         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index 2c55c04b..17558203 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,4 @@ pytest-runner
 sphinx
 twine
 wheel
+setuptools
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 9a83842e..91068e02 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@
     # Pin pytest-runner to 5.2.0, since 5.3.0 uses `find_namespaces` directive, not supported in
     # Python 2.7
     'pytest-runner == 5.2.0',
+    'setuptools'
 ]
 
 # WARNING: This imposes limitations on test/requirements.txt such that the