From c04e050735a4e5496b32818aae01cbc623937648 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Mon, 10 Apr 2023 22:09:36 +0200
Subject: [PATCH] Test with Python 3.11

---
 .github/workflows/test.yml | 6 +++---
 Jenkinsfile                | 9 +++++----
 pyproject.toml             | 1 +
 tox.ini                    | 5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 140c16ce9..7583982bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3
@@ -25,11 +25,11 @@ jobs:
 
       - name: Test with tox
         run: tox
-        if: ${{ matrix.python-version != '3.10' }}
+        if: ${{ matrix.python-version != '3.11' }}
 
       - name: Test with tox (and upload coverage)
         uses: paambaati/codeclimate-action@v4.0.0
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         env:
           CC_TEST_REPORTER_ID: 2a411f596959fc32f5d73f3ba7cef8cc4d5733299d742dbfc97fd6c190b9010c
         with:
diff --git a/Jenkinsfile b/Jenkinsfile
index 358109c71..52262e094 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,6 @@
 def pys = [
-    [name: 'Python 3.10', docker: '3.10-bullseye', tox:'py310,flake8', main: true],
+    [name: 'Python 3.11', docker: '3.11-bullseye', tox:'py311,flake8', main: true],
+    [name: 'Python 3.10', docker: '3.10-bullseye', tox:'py310', main: false],
     [name: 'Python 3.9',  docker: '3.9-bullseye',  tox:'py39', main: false],
     [name: 'Python 3.8',  docker: '3.8-bullseye',  tox:'py38', main: false],
     [name: 'Python 3.7',  docker: '3.7-bullseye',  tox:'py37', main: false],
@@ -75,7 +76,7 @@ pys.each { py ->
 parallel(tasks)
 parallel modern: {
         stage('Modern Windows binary') {
-            windowsBuild('3.10', 'dosage.exe')
+            windowsBuild('3.11', 'dosage.exe')
         }
     },
     legacy: {
@@ -111,9 +112,9 @@ def windowsBuildCommands(pyver, exename) {
             tar xvf dist/dosage-*.tar.gz
             cd dosage-*
             xvfb-run sh -c "
-                wine py -m pip install -e .[css] &&
+                wine python -m pip install -e .[css] &&
                 cd scripts &&
-                wine py -m PyInstaller -y dosage.spec;
+                wine python -m PyInstaller -y dosage.spec;
                 wineserver -w" 2>&1 | tee log.txt
         '''
         sh "mv */scripts/dist/*.exe $exename"
diff --git a/pyproject.toml b/pyproject.toml
index 5cac5d3ed..8e935c4b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Multimedia :: Graphics",
 ]
diff --git a/tox.ini b/tox.ini
index a79576852..161f868bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py39, py310, flake8
+envlist = py37, py38, py39, py310, py311, flake8
 isolated_build = True
 
 [gh-actions]
@@ -7,7 +7,8 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
-    3.10: py310, flake8
+    3.10: py310
+    3.11: py311, flake8
 
 [testenv]
 commands =