From 612968f8286cc47467a6ef76fcdb59f5a57ac19e Mon Sep 17 00:00:00 2001
From: Pavel Perestoronin <pavel.perestoronin@kpn.com>
Date: Thu, 25 Jan 2024 14:49:35 +0100
Subject: [PATCH] =?UTF-8?q?NEW:=20add=20Python=203.11=20and=203.12,=20and?=
 =?UTF-8?q?=20remove=203.7=20=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/lint.yml  |  8 +++++++-
 .github/workflows/tests.yml | 12 +++++++++---
 pyproject.toml              |  2 +-
 requirements.txt            |  1 +
 setup.py                    |  3 ++-
 tox.ini                     |  2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50028dc..a4f2c3c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,6 +1,12 @@
 name: Lint checks
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
 
 jobs:
   build:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fda730a..1c59879 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,6 +1,12 @@
 name: Unit tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
 
 jobs:
   build:
@@ -8,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -16,7 +22,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Tox and other dependencies
-      run: pip install tox tox-docker wheel twine
+      run: pip install tox tox-docker wheel twine 'setuptools; python_version >= "3.12"'
     - name: Run tests with Tox
       # Run tox using the version of Python in `PATH`
       run: tox -e py
diff --git a/pyproject.toml b/pyproject.toml
index 3bc7d2a..ebd2b1f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 120
-target_version = ["py37", "py38", "py39", "py310"]
+target_version = ["py38", "py39", "py310", "py311", "py312"]
 
 [tool.isort]
 combine_as_imports = true
diff --git a/requirements.txt b/requirements.txt
index f60b9b0..33072ee 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,7 @@ flake8
 mypy
 
 # Distribution
+setuptools; python_version >= "3.12"
 twine
 wheel
 
diff --git a/setup.py b/setup.py
index 5ad7d23..63bc487 100755
--- a/setup.py
+++ b/setup.py
@@ -39,10 +39,11 @@
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "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",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
diff --git a/tox.ini b/tox.ini
index f56a195..7e662ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 addopts = --tb=short
 
 [tox]
-envlist = py37,py38,py39,py310
+envlist = py38,py39,py310,py311,py312
 skipsdist = true
 
 [testenv]