Add support for Django 5.0

mozilla · Feb 29, 2024 · 0cad376 · 0cad376
1 parent 10c71fb
commit 0cad376
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 1 deletion.
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:
@@ -139,6 +139,30 @@ jobs:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
+  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>=5.0,<5.1
+    <<: *common_steps
+  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>=5.0,<5.1
+    <<: *common_steps
+  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>=5.0,<5.1
+    <<: *common_steps
   e2e_test_py38_hs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
@@ -179,6 +203,30 @@ 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
@@ -218,6 +266,15 @@ workflows:
       - e2e_test_py312_rs_django420:
           requires:
             - build_lib
+      - e2e_test_py310_rs_django500:
+          requires:
+            - build_lib
+      - e2e_test_py311_rs_django500:
+          requires:
+            - build_lib
+      - e2e_test_py312_rs_django500:
+          requires:
+            - build_lib
       - e2e_test_py38_hs_django420:
           requires:
             - build_lib
@@ -233,3 +290,12 @@ workflows:
       - e2e_test_py312_hs_django420:
           requires:
             - build_lib
+      - e2e_test_py310_hs_django500:
+          requires:
+            - build_lib
+      - e2e_test_py311_hs_django500:
+          requires:
+            - build_lib
+      - e2e_test_py312_hs_django500:
+          requires:
+            - build_lib
diff --git a/setup.py b/setup.py
@@ -57,6 +57,7 @@
         "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
@@ -3,6 +3,7 @@ envlist =
     lint
     py{38,39,310,311}-django320
     py{38,39,310,311,312}-django420
+    py{310,311,312}-django500
 
 [gh-actions]
 python =