Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Django 5.0 #526

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for Django 5.0 #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 57 additions & 57 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
history = open("HISTORY.rst").read().replace(".. :changelog:", "")

install_requirements = [
"Django >= 3.2",
"Django >= 4.2",
"josepy",
"requests",
"cryptography",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -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 =
Expand Down
Loading