Skip to content

Commit

Permalink
Merge pull request #413 from jannh/master
Browse files Browse the repository at this point in the history
Added tests for Django 3.2
  • Loading branch information
akatsoulas committed May 9, 2021
2 parents 2a7a1b2 + c98b01a commit 1c1bfdd
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
22 changes: 22 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,22 @@ jobs:
- TEST_OIDC_ALGO=hs
- DJANGO_VERSION=Django>=3.1.0,<3.2
<<: *common_steps
e2e_test_py3_rs_django320:
docker:
- image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
name: testoidcsetup
environment:
- TEST_OIDC_ALGO=rs
- DJANGO_VERSION=Django>=3.2.0,<4.0
<<: *common_steps
e2e_test_py3_hs_django320:
docker:
- image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
name: testoidcsetup
environment:
- TEST_OIDC_ALGO=hs
- DJANGO_VERSION=Django>=3.2.0,<4.0
<<: *common_steps

workflows:
version: 2
Expand All @@ -123,3 +139,9 @@ workflows:
- e2e_test_py3_hs_django310:
requires:
- build_lib
- e2e_test_py3_rs_django320:
requires:
- build_lib
- e2e_test_py3_hs_django320:
requires:
- build_lib
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
'Intended Audience :: Developers',
'Operating System :: MacOS',
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ envlist =
py{36,37,38,39}-django220
py{36,37,38,39}-django300
py{36,37,38,39}-django310
py{36,37,38,39}-django320

[gh-actions]
python =
Expand All @@ -26,14 +27,16 @@ deps =
django300: djangorestframework>=3.7
django310: Django>=3.1.0,<3.2
django310: djangorestframework>=3.7
django320: Django>=3.2.0,<4.0
django320: djangorestframework>=3.7

[testenv:coverage]
commands =
coverage run --source mozilla_django_oidc {envbindir}/django-admin.py test
deps =
coverage
-r{toxinidir}/tests/requirements.txt
Django>=3.1
Django>=3.2
djangorestframework>=3.9

[testenv:lint]
Expand Down

0 comments on commit 1c1bfdd

Please sign in to comment.