From 2bbf7de4d4a13ceb67bc6e4f1dff1233e41614d5 Mon Sep 17 00:00:00 2001
From: Oskar Persson <oskar.persson@polken.se>
Date: Tue, 21 Feb 2023 22:19:21 +0100
Subject: [PATCH] Add Django 4.1 to CI (#148)

---
 .github/workflows/main.yml | 28 +++++++++++++++++++++-------
 setup.py                   |  1 +
 tox.ini                    |  7 ++++---
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index caa67df..b840559 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,12 +10,12 @@ on:
 
 jobs:
   linting:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -33,7 +33,7 @@ jobs:
           isort . --check-only --diff
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
@@ -72,13 +72,18 @@ jobs:
           - "py38-django30"
           - "py38-django32"
           - "py38-django40"
+          - "py38-django41"
 
           - "py39-django30"
           - "py39-django32"
           - "py39-django40"
+          - "py39-django41"
 
           - "py310-django32"
           - "py310-django40"
+          - "py310-django41"
+
+          - "py311-django41"
 
         include:
           - python: "2.7"
@@ -143,6 +148,8 @@ jobs:
             tox_env: "py38-django32"
           - python: "3.8"
             tox_env: "py38-django40"
+          - python: "3.8"
+            tox_env: "py38-django41"
 
           - python: "3.9"
             tox_env: "py39-django30"
@@ -150,25 +157,32 @@ jobs:
             tox_env: "py39-django32"
           - python: "3.9"
             tox_env: "py39-django40"
+          - python: "3.9"
+            tox_env: "py39-django41"
 
           - python: "3.10"
             tox_env: "py310-django32"
           - python: "3.10"
             tox_env: "py310-django40"
+          - python: "3.10"
+            tox_env: "py310-django41"
+
+          - python: "3.11"
+            tox_env: "py311-django41"
 
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: Install
         run: |
           python -m pip install --upgrade wheel setuptools
-          pip install tox tox-venv
+          pip install distlib tox
 
       - name: Test
         run: |
diff --git a/setup.py b/setup.py
index e7edf41..9c1f373 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
 )
diff --git a/tox.ini b/tox.ini
index 55cb418..f1a71f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,11 +9,11 @@ envlist =
     {py36,py37,py38,py39}-django22,
     {py35,py36,py37,py38,py39}-django30,
     {py35,py36,py37,py38,py39,py310}-django32,
-    {py38,py39,py310}-{django40},
+    {py38,py39,py310}-django40,
+    {py38,py39,py310,py311}-django41,
 
 [testenv]
 commands = python manage.py test
-envdir = {toxworkdir}/venvs/{envname}
 setenv =
        PYTHONDONTWRITEBYTECODE=1
        PYTHONWARNINGS=once
@@ -28,5 +28,6 @@ deps =
         django30: Django>=3.0,<3.1
         django31: Django>=3.1,<3.2
         django32: Django>=3.2,<4.0
-        django40: Django>=4.0,<5.0
+        django40: Django>=4.0,<4.1
+        django41: Django==4.1.*