From 64d6193548d077598b6c02a3d154dfd76ba5a1ed Mon Sep 17 00:00:00 2001
From: Sergei Maertens <sergei@maykinmedia.nl>
Date: Tue, 6 Feb 2024 13:12:17 +0100
Subject: [PATCH] :boom: Drop support for EOL versions

mozilla-django-oidc version support seems to be:

* 3.x: Django 3.2, 4.0, 4.1 (unsure about 4.2)
* 4.x: Django 3.2, 4.2 (4.1 support dropped)

Django 3.2 supports up to Python 3.10. Django 4.2
supports 3.10, 3.11 and 3.12. We no longer support
Python versions older than 3.10.

We drop the explicit support of Django 4.1,
following mozilla's 4.x version. It may still
work, it may not - either way we only commit
to LTS Django versions.
---
 .github/workflows/ci.yml           | 9 ++++++---
 .github/workflows/code_quality.yml | 6 +++---
 setup.cfg                          | 2 +-
 tox.ini                            | 9 +++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8263793..75d9565 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,13 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.10', '3.11']
-        django: ['3.2', '4.1', '4.2']
+        python: ['3.10', '3.11', '3.12']
+        django: ['3.2', '4.2']
         mozilla_django_oidc: ['3.0', '4.0']
         exclude:
           - python: '3.11'
             django: '3.2'
-          - django: '4.2'  # support added in 4.0
+          - python: '3.12'
+            django: '3.2'
+          # support for django 4.2 was added in 4.0
+          - django: '4.2'
             mozilla_django_oidc: '3.0'
 
     name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, mozilla-django-oidc ${{ matrix.mozilla_django_oidc }})
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 98fcd07..a2c0d8d 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -21,10 +21,10 @@ jobs:
       matrix:
         toxenv: [isort, black]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install tox
       - run: tox
diff --git a/setup.cfg b/setup.cfg
index 1545c76..fd0713f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,7 +14,6 @@ classifiers =
     Development Status :: 4 - Beta
     Framework :: Django
     Framework :: Django :: 3.2
-    Framework :: Django :: 4.1
     Framework :: Django :: 4.2
     Intended Audience :: Developers
     Operating System :: Unix
@@ -22,6 +21,7 @@ classifiers =
     Operating System :: Microsoft :: Windows
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
diff --git a/tox.ini b/tox.ini
index e6042a1..7a2cd7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py310-django32-mozilla_django_oidc{20}
-    py{310,311}-django{41,42}-mozilla_django_oidc{30,40}
+    py310-django32-mozilla_django_oidc{30,40}
+    py{310,311,312}-django42-mozilla_django_oidc40
     isort
     black
     ; docs
@@ -11,14 +11,13 @@ skip_missing_interpreters = true
 python =
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 DJANGO =
     3.2: django32
-    4.1: django41
     4.2: django42
 MOZILLA_DJANGO_OIDC =
-    2.0: mozilla_django_oidc20
     3.0: mozilla_django_oidc30
     4.0: mozilla_django_oidc40
 [testenv]
@@ -27,9 +26,7 @@ extras =
     coverage
 deps =
   django32: Django~=3.2.0
-  django41: Django~=4.1.0
   django42: Django~=4.2.0
-  mozilla_django_oidc20: mozilla-django-oidc~=2.0.0
   mozilla_django_oidc30: mozilla-django-oidc~=3.0.0
   mozilla_django_oidc40: mozilla-django-oidc~=4.0.0
 passenv =