Add support for Django 5.0

* Drop support for Django 3.2
mozilla · Mar 22, 2024 · f9073e3 · f9073e3
1 parent 10c71fb
commit f9073e3
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 62 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,7 +24,7 @@ common_steps: &common_steps
         working_directory: /testprovider
     - run:
         name: Run testrp service
-        command:  . /testrp_env/bin/activate && ./bin/run.sh
+        command: . /testrp_env/bin/activate && ./bin/run.sh
         background: True
         working_directory: /testrp
     - run:
@@ -51,93 +51,69 @@ jobs:
           root: workspace
           paths:
             - mozilla-django-oidc-dev.tar.gz
-  e2e_test_py38_rs_django320:
+  e2e_test_py38_rs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py39_rs_django320:
+  e2e_test_py39_rs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py310_rs_django320:
+  e2e_test_py310_rs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
-    <<: *common_steps
-  e2e_test_py38_hs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
-    <<: *common_steps
-  e2e_test_py39_hs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
-    <<: *common_steps
-  e2e_test_py310_hs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py38_rs_django420:
+  e2e_test_py311_rs_django420:
     docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py39_rs_django420:
+  e2e_test_py312_rs_django420:
     docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py312-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py310_rs_django420:
+  e2e_test_py310_rs_django500:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.2,<5.0
+          - DJANGO_VERSION=Django>=5.0,<5.1
     <<: *common_steps
-  e2e_test_py311_rs_django420:
+  e2e_test_py311_rs_django500:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.2,<5.0
+          - DJANGO_VERSION=Django>=5.0,<5.1
     <<: *common_steps
-  e2e_test_py312_rs_django420:
+  e2e_test_py312_rs_django500:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py312-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.2,<5.0
+          - DJANGO_VERSION=Django>=5.0,<5.1
     <<: *common_steps
   e2e_test_py38_hs_django420:
     docker:
@@ -179,57 +155,81 @@ jobs:
           - TEST_OIDC_ALGO=hs
           - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
+  e2e_test_py310_hs_django500:
+    docker:
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=hs
+          - DJANGO_VERSION=Django>=5.0,<5.1
+    <<: *common_steps
+  e2e_test_py311_hs_django500:
+    docker:
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=hs
+          - DJANGO_VERSION=Django>=5.0,<5.1
+    <<: *common_steps
+  e2e_test_py312_hs_django500:
+    docker:
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py312-latest
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=hs
+          - DJANGO_VERSION=Django>=5.0,<5.1
+    <<: *common_steps
 
 workflows:
   version: 2
   build_and_test:
     jobs:
       - build_lib
-      - e2e_test_py38_rs_django320:
+      - e2e_test_py38_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py39_rs_django320:
+      - e2e_test_py39_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py310_rs_django320:
+      - e2e_test_py310_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py38_hs_django320:
+      - e2e_test_py311_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py39_hs_django320:
+      - e2e_test_py312_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py310_hs_django320:
+      - e2e_test_py310_rs_django500:
           requires:
             - build_lib
-      - e2e_test_py38_rs_django420:
+      - e2e_test_py311_rs_django500:
           requires:
             - build_lib
-      - e2e_test_py39_rs_django420:
+      - e2e_test_py312_rs_django500:
           requires:
             - build_lib
-      - e2e_test_py310_rs_django420:
+      - e2e_test_py38_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py311_rs_django420:
+      - e2e_test_py39_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py312_rs_django420:
+      - e2e_test_py310_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py38_hs_django420:
+      - e2e_test_py311_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py39_hs_django420:
+      - e2e_test_py312_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py310_hs_django420:
+      - e2e_test_py310_hs_django500:
           requires:
             - build_lib
-      - e2e_test_py311_hs_django420:
+      - e2e_test_py311_hs_django500:
           requires:
             - build_lib
-      - e2e_test_py312_hs_django420:
+      - e2e_test_py312_hs_django500:
           requires:
             - build_lib
diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
 history = open("HISTORY.rst").read().replace(".. :changelog:", "")
 
 install_requirements = [
-    "Django >= 3.2",
+    "Django >= 4.2",
     "josepy",
     "requests",
     "cryptography",
@@ -55,8 +55,8 @@
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
         "Intended Audience :: Developers",
         "Operating System :: MacOS",

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
     lint
-    py{38,39,310,311}-django320
     py{38,39,310,311,312}-django420
+    py{310,311,312}-django500
 
 [gh-actions]
 python =
@@ -20,10 +20,10 @@ setenv =
     PYTHONWARNINGS=default
 deps =
     -r{toxinidir}/tests/requirements.txt
-    django320: Django>=3.2.0,<4.0
-    django320: djangorestframework>=3.14
     django420: Django>=4.2,<5.0
     django420: djangorestframework>=3.14
+    django500: Django>=5.0,<5.1
+    django500: djangorestframework>=3.15
 
 [testenv:coverage]
 commands =