Merge pull request #477 from jannh/master

Added testing for Django 4.1 and Python 3.11 - Update testing dependency of djangorestframework to 3.14
mozilla · Dec 12, 2022 · 68d0557 · 68d0557
2 parents 5c1417d + 70bc5ee
commit 68d0557
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -83,6 +83,14 @@ 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
@@ -115,6 +123,14 @@ 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:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
@@ -139,6 +155,14 @@ jobs:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=4.0,<4.1
     <<: *common_steps
+  e2e_test_py311_rs_django400:
+    docker:
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=rs
+          - DJANGO_VERSION=Django>=4.0,<4.1
+    <<: *common_steps
   e2e_test_py38_hs_django400:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py38-latest
@@ -163,6 +187,78 @@ jobs:
           - TEST_OIDC_ALGO=hs
           - DJANGO_VERSION=Django>=4.0,<4.1
     <<: *common_steps
+  e2e_test_py311_hs_django400:
+    docker:
+      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py311-latest
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=hs
+          - DJANGO_VERSION=Django>=4.0,<4.1
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
+  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.1,<4.2
+    <<: *common_steps
 
 workflows:
   version: 2
@@ -181,6 +277,9 @@ 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
@@ -193,6 +292,9 @@ workflows:
       - e2e_test_py310_hs_django320:
           requires:
             - build_lib
+      - e2e_test_py311_hs_django320:
+          requires:
+            - build_lib
       - e2e_test_py38_rs_django400:
           requires:
             - build_lib
@@ -202,6 +304,9 @@ workflows:
       - e2e_test_py310_rs_django400:
           requires:
             - build_lib
+      - e2e_test_py311_rs_django400:
+          requires:
+            - build_lib
       - e2e_test_py38_hs_django400:
           requires:
             - build_lib
@@ -211,3 +316,30 @@ workflows:
       - e2e_test_py310_hs_django400:
           requires:
             - build_lib
+      - e2e_test_py311_hs_django400:
+          requires:
+            - build_lib
+      - e2e_test_py38_rs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py39_rs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py310_rs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py311_rs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py38_hs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py39_hs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py310_hs_django410:
+          requires:
+            - build_lib
+      - e2e_test_py311_hs_django410:
+          requires:
+            - build_lib
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
     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.10'
+          python-version: '3.11'
       - 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.10"
+          python-version: "3.11"
       - name: Install dependencies
         run: pip install tox tox-gh-actions build
       - name: Run tox

diff --git a/setup.py b/setup.py
@@ -57,6 +57,7 @@
         "Framework :: Django",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
         "Intended Audience :: Developers",
         "Operating System :: MacOS",
@@ -68,5 +69,6 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -1,15 +1,17 @@
 [tox]
 envlist =
     lint
-    py{37,38,39,310}-django320
-    py{38,39,310}-django400
+    py{37,38,39,310,311}-django320
+    py{38,39,310,311}-django400
+    py{38,39,310,311}-django410
 
 [gh-actions]
 python =
   3.7: py37
   3.8: py38
   3.9: py39
-  3.10: py310, coverage, lint
+  3.10: py310
+  3.11: py311, coverage, lint
 
 [testenv]
 commands = django-admin test
@@ -20,18 +22,20 @@ setenv =
 deps =
     -r{toxinidir}/tests/requirements.txt
     django320: Django>=3.2.0,<4.0
-    django320: djangorestframework>=3.7
+    django320: djangorestframework>=3.14
     django400: Django>=4.0,<4.1
-    django400: djangorestframework>=3.7
+    django400: djangorestframework>=3.14
+    django410: Django>=4.1,<4.2
+    django410: djangorestframework>=3.14
 
 [testenv:coverage]
 commands =
     coverage run --source mozilla_django_oidc {envbindir}/django-admin test
 deps =
     coverage
     -r{toxinidir}/tests/requirements.txt
-    Django>=3.2
-    djangorestframework>=3.9
+    Django>=4.1
+    djangorestframework>=3.14
 
 [testenv:lint]
 deps =
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ jobs: @@
               - "3.8"
               - "3.9"
               - "3.10"
+              - "3.11"
         name: Python ${{ matrix.python_version }}
         steps:
           - name: Checkout repository
@@ Expand Down @@