mozilla
/
mozilla-django-oidc
зеркало из https://github.com/mozilla/mozilla-django-oidc.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update support matrix. 

* Added support for Python 3.12
* Dropped support for Python 3.7
* Added support for Django 4.2
This commit is contained in:
Tasos Katsoulas 2023-11-24 16:10:20 +02:00
Родитель adea0943bc
Коммит b30f0ed86c
6 изменённых файлов: 122 добавлений и 144 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

242
.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,78 +99,6 @@ 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
name: testoidcsetup
environment:
- TEST_OIDC_ALGO=rs
- DJANGO_VERSION=Django>=4.0,<4.1
<<: *common_steps
e2e_test_py39_rs_django400:
docker:
- image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
name: testoidcsetup
environment:
- TEST_OIDC_ALGO=rs
- DJANGO_VERSION=Django>=4.0,<4.1
<<: *common_steps
e2e_test_py310_rs_django400:
docker:
- image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
name: testoidcsetup
environment:
- 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
name: testoidcsetup
environment:
- TEST_OIDC_ALGO=hs
- DJANGO_VERSION=Django>=4.0,<4.1
<<: *common_steps
e2e_test_py39_hs_django400:
docker:
- image: mozilla/oidc-testprovider:oidc_e2e_setup_py39-latest
name: testoidcsetup
environment:
- TEST_OIDC_ALGO=hs
- DJANGO_VERSION=Django>=4.0,<4.1
<<: *common_steps
e2e_test_py310_hs_django400:
docker:
- image: mozilla/oidc-testprovider:oidc_e2e_setup_py310-latest
name: testoidcsetup
environment:
- 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
@ -259,15 +163,92 @@ jobs:
- TEST_OIDC_ALGO=hs
- DJANGO_VERSION=Django>=4.1,<4.2
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.2,<5.0
<<: *common_steps
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.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,33 +267,6 @@ 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
- e2e_test_py39_rs_django400:
requires:
- build_lib
- e2e_test_py310_rs_django400:
requires:
- build_lib
- e2e_test_py311_rs_django400:
requires:
- build_lib
- e2e_test_py38_hs_django400:
requires:
- build_lib
- e2e_test_py39_hs_django400:
requires:
- build_lib
- e2e_test_py310_hs_django400:
requires:
- build_lib
- e2e_test_py311_hs_django400:
requires:
- build_lib
- e2e_test_py38_rs_django410:
requires:
- build_lib
@ -343,3 +291,33 @@ workflows:
- e2e_test_py311_hs_django410:
requires:
- build_lib
- e2e_test_py38_rs_django420:
requires:
- build_lib
- e2e_test_py39_rs_django420:
requires:
- build_lib
- e2e_test_py310_rs_django420:
requires:
- build_lib
- e2e_test_py311_rs_django420:
requires:
- build_lib
- e2e_test_py312_rs_django420:
requires:
- build_lib
- e2e_test_py38_hs_django420:
requires:
- build_lib
- e2e_test_py39_hs_django420:
requires:
- build_lib
- e2e_test_py310_hs_django420:
requires:
- build_lib
- e2e_test_py311_hs_django420:
requires:
- build_lib
- e2e_test_py312_hs_django420:
requires:
- build_lib

2
.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

2
.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

2
.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

4
setup.py
Просмотреть файл

@ -56,8 +56,8 @@ setup(
"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",
@ -65,10 +65,10 @@ setup(
"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",
],
)

14
tox.ini
Просмотреть файл

@ -1,17 +1,17 @@
[tox]
envlist =
lint
py{37,38,39,310,311}-django320
py{38,39,310,311}-django400
py{38,39,310,311}-django320
py{38,39,310,311}-django410
py{38,39,310,311,312}-django420
[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311, coverage, lint
3.11: py311
3.12: py312, coverage, lint
[testenv]
commands = django-admin test
@ -23,10 +23,10 @@ deps =
-r{toxinidir}/tests/requirements.txt
django320: Django>=3.2.0,<4.0
django320: djangorestframework>=3.14
django400: Django>=4.0,<4.1
django400: djangorestframework>=3.14
django410: Django>=4.1,<4.2
django410: djangorestframework>=3.14
django420: Django>=4.2,<5.0
django420: djangorestframework>=3.14
[testenv:coverage]
commands =
@ -34,7 +34,7 @@ commands =
deps =
coverage
-r{toxinidir}/tests/requirements.txt
Django>=4.1
Django>=4.2
djangorestframework>=3.14
[testenv:lint]