Merge pull request #510 from akatsoulas/python-support

Update support matrix.
mozilla · Nov 28, 2023 · 58b229e · 58b229e
2 parents 878ccd6 + b30f0ed
commit 58b229e
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 102 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -51,14 +51,6 @@ jobs:
           root: workspace
           paths:
             - mozilla-django-oidc-dev.tar.gz
-  e2e_test_py37_rs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py37-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
-    <<: *common_steps
   e2e_test_py38_rs_django320:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
@@ -83,22 +75,6 @@ jobs:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=3.2.0,<4.0
     <<: *common_steps
-  e2e_test_py311_rs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
-    <<: *common_steps
-  e2e_test_py37_hs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py37-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - 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
@@ -123,151 +99,156 @@ jobs:
           - TEST_OIDC_ALGO=hs
           - DJANGO_VERSION=Django>=3.2.0,<4.0
     <<: *common_steps
-  e2e_test_py311_hs_django320:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=3.2.0,<4.0
-    <<: *common_steps
-  e2e_test_py38_rs_django400:
+  e2e_test_py38_rs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py39_rs_django400:
+  e2e_test_py39_rs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py310_rs_django400:
+  e2e_test_py310_rs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py311_rs_django400:
+  e2e_test_py311_rs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py38_hs_django400:
+  e2e_test_py38_hs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py39_hs_django400:
+  e2e_test_py39_hs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py310_hs_django400:
+  e2e_test_py310_hs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py311_hs_django400:
+  e2e_test_py311_hs_django410:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.0,<4.1
+          - DJANGO_VERSION=Django>=4.1,<4.2
     <<: *common_steps
-  e2e_test_py38_rs_django410:
+  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>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py39_rs_django410:
+  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>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py310_rs_django410:
+  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>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py311_rs_django410:
+  e2e_test_py311_rs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py38_hs_django410:
+  e2e_test_py312_rs_django420:
+    docker:
+      - 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_py38_hs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py39_hs_django410:
+  e2e_test_py39_hs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py310_hs_django410:
+  e2e_test_py310_hs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
-  e2e_test_py311_hs_django410:
+  e2e_test_py311_hs_django420:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=4.1,<4.2
+          - DJANGO_VERSION=Django>=4.2,<5.0
+    <<: *common_steps
+  e2e_test_py312_hs_django420:
+    docker:
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py312-latest
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=hs
+          - DJANGO_VERSION=Django>=4.2,<5.0
     <<: *common_steps
 
 workflows:
   version: 2
   build_and_test:
     jobs:
       - build_lib
-      - e2e_test_py37_rs_django320:
-          requires:
-            - build_lib
       - e2e_test_py38_rs_django320:
           requires:
             - build_lib
@@ -277,12 +258,6 @@ workflows:
       - e2e_test_py310_rs_django320:
           requires:
             - build_lib
-      - e2e_test_py311_rs_django320:
-          requires:
-            - build_lib
-      - e2e_test_py37_hs_django320:
-          requires:
-            - build_lib
       - e2e_test_py38_hs_django320:
           requires:
             - build_lib
@@ -292,54 +267,57 @@ workflows:
       - e2e_test_py310_hs_django320:
           requires:
             - build_lib
-      - e2e_test_py311_hs_django320:
+      - e2e_test_py38_rs_django410:
           requires:
             - build_lib
-      - e2e_test_py38_rs_django400:
+      - e2e_test_py39_rs_django410:
           requires:
             - build_lib
-      - e2e_test_py39_rs_django400:
+      - e2e_test_py310_rs_django410:
           requires:
             - build_lib
-      - e2e_test_py310_rs_django400:
+      - e2e_test_py311_rs_django410:
           requires:
             - build_lib
-      - e2e_test_py311_rs_django400:
+      - e2e_test_py38_hs_django410:
           requires:
             - build_lib
-      - e2e_test_py38_hs_django400:
+      - e2e_test_py39_hs_django410:
           requires:
             - build_lib
-      - e2e_test_py39_hs_django400:
+      - e2e_test_py310_hs_django410:
           requires:
             - build_lib
-      - e2e_test_py310_hs_django400:
+      - e2e_test_py311_hs_django410:
           requires:
             - build_lib
-      - e2e_test_py311_hs_django400:
+      - e2e_test_py38_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py38_rs_django410:
+      - e2e_test_py39_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py39_rs_django410:
+      - e2e_test_py310_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py310_rs_django410:
+      - e2e_test_py311_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py311_rs_django410:
+      - e2e_test_py312_rs_django420:
           requires:
             - build_lib
-      - e2e_test_py38_hs_django410:
+      - e2e_test_py38_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py39_hs_django410:
+      - e2e_test_py39_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py310_hs_django410:
+      - e2e_test_py310_hs_django420:
           requires:
             - build_lib
-      - e2e_test_py311_hs_django410:
+      - e2e_test_py311_hs_django420:
+          requires:
+            - build_lib
+      - e2e_test_py312_hs_django420:
           requires:
             - build_lib
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,11 +7,11 @@ jobs:
     strategy:
       matrix:
         python_version:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     name: Python ${{ matrix.python_version }}
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Install dependencies
         run: pip install codecov tox tox-gh-actions
       - name: Run tox

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install dependencies
         run: pip install tox tox-gh-actions build
       - name: Run tox

diff --git a/setup.py b/setup.py
@@ -56,19 +56,19 @@
         "Development Status :: 5 - Production/Stable",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
+        "Framework :: Django :: 4.2",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
         "Intended Audience :: Developers",
         "Operating System :: MacOS",
         "Operating System :: POSIX :: Linux",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "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",
+        "Programming Language :: Python :: 3.12",
     ],
 )