From 6c1aec4df0977ce1354a4231b84c76fcc2e49191 Mon Sep 17 00:00:00 2001
From: Erhan <erhan.citil@maykinmedia.nl>
Date: Fri, 30 Jun 2023 10:47:12 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20[#634]=20Upgraded=20Dja?=
 =?UTF-8?q?ngo=20version=20to=204.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml                       | 14 +++++++-------
 .gitignore                                     |  1 +
 README.rst                                     |  2 ++
 .../migrations/0001_initial.py                 |  1 -
 ...connectconfig_oidc_op_discovery_endpoint.py |  1 -
 .../migrations/0003_auto_20210719_0803.py      |  1 -
 .../migrations/0004_auto_20210812_1044.py      |  1 -
 ...idconnectconfig_sync_groups_glob_pattern.py |  1 -
 ...0006_openidconnectconfig_unique_id_claim.py |  1 -
 .../migrations/0007_auto_20220307_1128.py      |  1 -
 .../migrations/0008_auto_20220422_0849.py      |  1 -
 .../0009_openidconnectconfig_default_groups.py |  1 -
 ...enidconnectconfig_userinfo_claims_source.py |  1 -
 ...enidconnectconfig_userinfo_claims_source.py |  1 -
 setup.cfg                                      | 10 +++++-----
 tox.ini                                        | 18 +++++++++---------
 16 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ac389f2..a3d48ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10']
-        django: ['3.2', '4.0']
-        mozilla_django_oidc: ['1.2', '2.0']
+        python: ['3.8', '3.9', '3.10', '3.11']
+        django: ['3.2', '4.1', '4.2']
+        mozilla_django_oidc: ['2.0', '3.0']
         exclude:
-          - python: '3.7'
-            django: '4.0'
-          - django: '4.0'
-            mozilla_django_oidc: '1.2'
+          - django: ['4.1', '4.2']
+            mozilla_django_oidc: '2.0'
+          - python: '3.11'
+            django: '3.2'
 
     name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, mozilla-django-oidc ${{ matrix.mozilla_django_oidc }})
 
diff --git a/.gitignore b/.gitignore
index 894a44c..bbee189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ wheels/
 .installed.cfg
 *.egg
 MANIFEST
+reports/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
diff --git a/README.rst b/README.rst
index 1f957ef..9610c25 100644
--- a/README.rst
+++ b/README.rst
@@ -48,6 +48,8 @@ Requirements
 * setuptools 30.4.0 or above
 * Django 3.2 or newer
 * A database supporting ``models.JSONField``
+* If you're using Django 4.1 or newer, you need at least mozilla-django-oidc 3.0.
+  2.0 is still supported with Django 3.2.
 
 
 Install
diff --git a/mozilla_django_oidc_db/migrations/0001_initial.py b/mozilla_django_oidc_db/migrations/0001_initial.py
index b276788..a498e6e 100644
--- a/mozilla_django_oidc_db/migrations/0001_initial.py
+++ b/mozilla_django_oidc_db/migrations/0001_initial.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
diff --git a/mozilla_django_oidc_db/migrations/0002_openidconnectconfig_oidc_op_discovery_endpoint.py b/mozilla_django_oidc_db/migrations/0002_openidconnectconfig_oidc_op_discovery_endpoint.py
index a0003f3..81faf54 100644
--- a/mozilla_django_oidc_db/migrations/0002_openidconnectconfig_oidc_op_discovery_endpoint.py
+++ b/mozilla_django_oidc_db/migrations/0002_openidconnectconfig_oidc_op_discovery_endpoint.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0001_initial"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0003_auto_20210719_0803.py b/mozilla_django_oidc_db/migrations/0003_auto_20210719_0803.py
index c7310c1..6f83686 100644
--- a/mozilla_django_oidc_db/migrations/0003_auto_20210719_0803.py
+++ b/mozilla_django_oidc_db/migrations/0003_auto_20210719_0803.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         (
             "mozilla_django_oidc_db",
diff --git a/mozilla_django_oidc_db/migrations/0004_auto_20210812_1044.py b/mozilla_django_oidc_db/migrations/0004_auto_20210812_1044.py
index df67aef..9d661f7 100644
--- a/mozilla_django_oidc_db/migrations/0004_auto_20210812_1044.py
+++ b/mozilla_django_oidc_db/migrations/0004_auto_20210812_1044.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0003_auto_20210719_0803"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0005_openidconnectconfig_sync_groups_glob_pattern.py b/mozilla_django_oidc_db/migrations/0005_openidconnectconfig_sync_groups_glob_pattern.py
index 23bf574..2dc6141 100644
--- a/mozilla_django_oidc_db/migrations/0005_openidconnectconfig_sync_groups_glob_pattern.py
+++ b/mozilla_django_oidc_db/migrations/0005_openidconnectconfig_sync_groups_glob_pattern.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0004_auto_20210812_1044"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0006_openidconnectconfig_unique_id_claim.py b/mozilla_django_oidc_db/migrations/0006_openidconnectconfig_unique_id_claim.py
index bbbad26..7f72ffa 100644
--- a/mozilla_django_oidc_db/migrations/0006_openidconnectconfig_unique_id_claim.py
+++ b/mozilla_django_oidc_db/migrations/0006_openidconnectconfig_unique_id_claim.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0005_openidconnectconfig_sync_groups_glob_pattern"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0007_auto_20220307_1128.py b/mozilla_django_oidc_db/migrations/0007_auto_20220307_1128.py
index 544a979..0ec5673 100644
--- a/mozilla_django_oidc_db/migrations/0007_auto_20220307_1128.py
+++ b/mozilla_django_oidc_db/migrations/0007_auto_20220307_1128.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0006_openidconnectconfig_unique_id_claim"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0008_auto_20220422_0849.py b/mozilla_django_oidc_db/migrations/0008_auto_20220422_0849.py
index a525a95..99efd0a 100644
--- a/mozilla_django_oidc_db/migrations/0008_auto_20220422_0849.py
+++ b/mozilla_django_oidc_db/migrations/0008_auto_20220422_0849.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0007_auto_20220307_1128"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0009_openidconnectconfig_default_groups.py b/mozilla_django_oidc_db/migrations/0009_openidconnectconfig_default_groups.py
index d9f9df6..feb2741 100644
--- a/mozilla_django_oidc_db/migrations/0009_openidconnectconfig_default_groups.py
+++ b/mozilla_django_oidc_db/migrations/0009_openidconnectconfig_default_groups.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("auth", "0001_initial"),
         ("mozilla_django_oidc_db", "0008_auto_20220422_0849"),
diff --git a/mozilla_django_oidc_db/migrations/0010_openidconnectconfig_userinfo_claims_source.py b/mozilla_django_oidc_db/migrations/0010_openidconnectconfig_userinfo_claims_source.py
index 5144307..4617cfc 100644
--- a/mozilla_django_oidc_db/migrations/0010_openidconnectconfig_userinfo_claims_source.py
+++ b/mozilla_django_oidc_db/migrations/0010_openidconnectconfig_userinfo_claims_source.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0009_openidconnectconfig_default_groups"),
     ]
diff --git a/mozilla_django_oidc_db/migrations/0011_alter_openidconnectconfig_userinfo_claims_source.py b/mozilla_django_oidc_db/migrations/0011_alter_openidconnectconfig_userinfo_claims_source.py
index 7cb1ab3..471b66c 100644
--- a/mozilla_django_oidc_db/migrations/0011_alter_openidconnectconfig_userinfo_claims_source.py
+++ b/mozilla_django_oidc_db/migrations/0011_alter_openidconnectconfig_userinfo_claims_source.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("mozilla_django_oidc_db", "0010_openidconnectconfig_userinfo_claims_source"),
     ]
diff --git a/setup.cfg b/setup.cfg
index 5ea9ccb..8b4bb48 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,15 +14,16 @@ classifiers =
     Development Status :: 4 - Beta
     Framework :: Django
     Framework :: Django :: 3.2
-    Framework :: Django :: 4.0
+    Framework :: Django :: 4.1
+    Framework :: Django :: 4.2
     Intended Audience :: Developers
     Operating System :: Unix
     Operating System :: MacOS
     Operating System :: Microsoft :: Windows
-    Programming Language :: Python :: 3.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
 
 [options]
@@ -30,11 +31,11 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires =
-    django>=3.1.0
+    Django >=3.2
     django-better-admin-arrayfield
     django-solo
     glom
-    mozilla-django-oidc >=1.0.0, <3.0
+    mozilla-django-oidc >=2.0.0
 tests_require =
     psycopg2
     pytest
@@ -76,7 +77,6 @@ line_length = 88
 multi_line_output = 3
 skip = env,.tox,.history,.eggs
 ; skip_glob =
-not_skip = __init__.py
 known_django=django
 known_first_party=mozilla_django_oidc_db
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
diff --git a/tox.ini b/tox.ini
index fcd76e4..4b6d559 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,7 @@
 [tox]
 envlist =
-    py37-django32-mozilla_django_oidc{12,20}
-    py{38,39,310}-django32-mozilla_django_oidc{12,20}
-    py{38,39,310}-django40-mozilla_django_oidc20
+    py{38,39,310}-django32-mozilla_django_oidc{20}
+    py{38,39,310,311}-django{41,42}-mozilla_django_oidc{30}
     isort
     black
     ; docs
@@ -10,28 +9,29 @@ skip_missing_interpreters = true
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [gh-actions:env]
 DJANGO =
     3.2: django32
-    4.0: django40
+    4.1: django41
+    4.2: django42
 MOZILLA_DJANGO_OIDC =
-    1.2: mozilla_django_oidc12
     2.0: mozilla_django_oidc20
-
+    3.0: mozilla_django_oidc30
 [testenv]
 extras =
     tests
     coverage
 deps =
   django32: Django~=3.2.0
-  django40: Django~=4.0.0
-  mozilla_django_oidc12: mozilla-django-oidc~=1.2.4
+  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
 passenv =
     PGUSER
     PGDATABASE