From f37648c76b5ceeb35e0907a4e634849a529efac1 Mon Sep 17 00:00:00 2001
From: Sergei Maertens <sergei@maykinmedia.nl>
Date: Tue, 6 Feb 2024 11:34:04 +0100
Subject: [PATCH] :boom: Require Python 3.10+

* Dropped support for Python 3.8 and 3.9
* Dropped support for mozilla-django-oidc 2.0
---
 .github/workflows/ci.yml | 18 +++++++++---------
 setup.cfg                |  5 ++---
 tox.ini                  |  8 ++++----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3d48ab..8263793 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11']
+        python: ['3.10', '3.11']
         django: ['3.2', '4.1', '4.2']
-        mozilla_django_oidc: ['2.0', '3.0']
+        mozilla_django_oidc: ['3.0', '4.0']
         exclude:
-          - django: ['4.1', '4.2']
-            mozilla_django_oidc: '2.0'
           - python: '3.11'
             django: '3.2'
+          - django: '4.2'  # support added in 4.0
+            mozilla_django_oidc: '3.0'
 
     name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, mozilla-django-oidc ${{ matrix.mozilla_django_oidc }})
 
@@ -37,8 +37,8 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -65,10 +65,10 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.10'
 
       - name: Build sdist and wheel
         run: |
diff --git a/setup.cfg b/setup.cfg
index ad974f0..1545c76 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,8 +20,6 @@ classifiers =
     Operating System :: Unix
     Operating System :: MacOS
     Operating System :: Microsoft :: Windows
-    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
@@ -30,12 +28,13 @@ classifiers =
 zip_safe = False
 include_package_data = True
 packages = find:
+python_requires = >=3.10
 install_requires =
     Django >=3.2
     django-jsonform
     django-solo
     glom
-    mozilla-django-oidc >=2.0.0
+    mozilla-django-oidc >=3.0.0
 tests_require =
     psycopg2
     pytest
diff --git a/tox.ini b/tox.ini
index 4b6d559..e6042a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{38,39,310}-django32-mozilla_django_oidc{20}
-    py{38,39,310,311}-django{41,42}-mozilla_django_oidc{30}
+    py310-django32-mozilla_django_oidc{20}
+    py{310,311}-django{41,42}-mozilla_django_oidc{30,40}
     isort
     black
     ; docs
@@ -9,8 +9,6 @@ skip_missing_interpreters = true
 
 [gh-actions]
 python =
-    3.8: py38
-    3.9: py39
     3.10: py310
     3.11: py311
 
@@ -22,6 +20,7 @@ DJANGO =
 MOZILLA_DJANGO_OIDC =
     2.0: mozilla_django_oidc20
     3.0: mozilla_django_oidc30
+    4.0: mozilla_django_oidc40
 [testenv]
 extras =
     tests
@@ -32,6 +31,7 @@ deps =
   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 =
     PGUSER
     PGDATABASE