From c25c960132519152d47675651e880ba8db520652 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Fri, 27 Oct 2023 01:38:58 +0200
Subject: [PATCH] Build with Python 3.12

---
 .github/workflows/ci.yaml   | 4 ++--
 .github/workflows/pages.yml | 2 +-
 Jenkinsfile                 | 9 +++++----
 pyproject.toml              | 1 +
 tests/modules/Jenkinsfile   | 2 +-
 tox.ini                     | 5 +++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7a0653a5e..c4b954a61 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -6,14 +6,14 @@ on:
   - pull_request
 
 env:
-  DEFAULT_PYTHON: '3.11'
+  DEFAULT_PYTHON: '3.12'
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index b169ebf9b..ff96512be 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Build
         run: |
diff --git a/Jenkinsfile b/Jenkinsfile
index 4a2ee6258..db7d2c10c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,10 @@
 def pys = [
-    [name: 'Python 3.11', docker: '3.11-bookworm', tox:'py311,flake8', main: true],
+    [name: 'Python 3.12', docker: '3.12-bookworm', tox:'py312,flake8', main: true],
+    [name: 'Python 3.11', docker: '3.11-bookworm', tox:'py311', main: false],
     [name: 'Python 3.10', docker: '3.10-bookworm', tox:'py310', main: false],
-    [name: 'Python 3.9',  docker: '3.9-bookworm',  tox:'py39', main: false],
-    [name: 'Python 3.8',  docker: '3.8-bookworm',  tox:'py38', main: false],
-    [name: 'Python 3.7',  docker: '3.7-bookworm',  tox:'py37', main: false],
+    [name: 'Python 3.9',  docker: '3.9-bookworm',  tox:'py39',  main: false],
+    [name: 'Python 3.8',  docker: '3.8-bookworm',  tox:'py38',  main: false],
+    [name: 'Python 3.7',  docker: '3.7-bookworm',  tox:'py37',  main: false],
 ]
 
 properties([
diff --git a/pyproject.toml b/pyproject.toml
index af7c92ea0..7b92c58b8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
     "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 :: Multimedia :: Graphics",
 ]
diff --git a/tests/modules/Jenkinsfile b/tests/modules/Jenkinsfile
index 4f157ebc1..8fba07697 100644
--- a/tests/modules/Jenkinsfile
+++ b/tests/modules/Jenkinsfile
@@ -9,7 +9,7 @@ node {
     stage ('Run tests') {
         timeout(time: 12, unit: 'HOURS') {
             withCredentials([string(credentialsId: 'proxymap', variable: 'PROXYMAP')]) {
-                sh 'podman run --rm -v $PWD:/work --userns=keep-id docker.io/python:3.11-bookworm /work/tests/modules/testall.sh'
+                sh 'podman run --rm -v $PWD:/work --userns=keep-id docker.io/python:3.12-bookworm /work/tests/modules/testall.sh'
             }
         }
     }
diff --git a/tox.ini b/tox.ini
index 161f868bc..27eed7f37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py39, py310, py311, flake8
+envlist = py37, py38, py39, py310, py311, py312, flake8
 isolated_build = True
 
 [gh-actions]
@@ -8,7 +8,8 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310
-    3.11: py311, flake8
+    3.11: py311
+    3.12: py312, flake8
 
 [testenv]
 commands =