From 802fef95fa1c59a1b5e1715910426268c97f3b6f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 22 Dec 2020 23:07:32 +0100 Subject: [PATCH] Add Django 3.1 and Python 3.9 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yohann D'ANELLO Signed-off-by: Yohann D'ANELLO --- .travis.yml | 6 +++ README.rst | 4 +- setup.py | 4 +- tox.ini | 112 +++++++++++++++++++++------------------------------- 4 files changed, 55 insertions(+), 71 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f0543b..cf7fa85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,12 @@ matrix: - python: "3.8" env: TOX_ENV=py38-django30 - python: "3.8" + env: TOX_ENV=py38-django31 + - python: "3.9" + env: TOX_ENV=py39-django30 + - python: "3.9" + env: TOX_ENV=py39-django31 + - python: "3.9" env: TOX_ENV=coverage cache: directories: diff --git a/README.rst b/README.rst index 87b663f..afd3fba 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Features * Possibility to rename/rewrite attributes per service * Possibility to require some attribute values per service * Federated mode between multiple CAS -* Supports Django 1.11, 2.2 and 3.0 +* Supports Django 1.11, 2.2 and 3.1 * Supports Python 2.7, 3.5+ Dependencies @@ -29,7 +29,7 @@ Dependencies ``django-cas-server`` depends on the following python packages: -* Django >= 1.11 < 3.1 +* Django >= 1.11 < 3.2 * requests >= 2.4 * requests_futures >= 0.9.5 * lxml >= 3.4 diff --git a/setup.py b/setup.py index 38cfb70..417892e 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ if __name__ == '__main__': 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.0', + 'Framework :: Django :: 3.1', 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', @@ -48,6 +49,7 @@ if __name__ == '__main__': 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', @@ -62,7 +64,7 @@ if __name__ == '__main__': }, keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'], install_requires=[ - 'Django >= 1.11,<3.1', 'requests >= 2.4', 'requests_futures >= 0.9.5', + 'Django >= 1.11,<3.2', 'requests >= 2.4', 'requests_futures >= 0.9.5', 'lxml >= 3.4', 'six >= 1' ], url="https://github.com/nitmir/django-cas-server", diff --git a/tox.ini b/tox.ini index c398c06..a8a45d5 100644 --- a/tox.ini +++ b/tox.ini @@ -9,9 +9,15 @@ envlist= py36-django22, py37-django22, py38-django22, + py39-django22, py36-django30, py37-django30, py38-django30, + py39-django30, + py36-django31, + py37-django31, + py38-django31, + py39-django31, [flake8] max-line-length=100 @@ -37,54 +43,12 @@ commands= {[post_cmd]commands} whitelist_externals={[post_cmd]whitelist_externals} -[testenv:py27-django17] -basepython=python2.7 -deps = - Django>=1.7,<1.8 - {[base]deps} - -[testenv:py27-django18] -basepython=python2.7 -deps = - Django>=1.8,<1.9 - {[base]deps} - -[testenv:py27-django19] -basepython=python2.7 -deps = - Django>=1.9,<1.10 - {[base]deps} - -[testenv:py27-django110] -basepython=python2.7 -deps = - Django>=1.10,<1.11 - {[base]deps} - [testenv:py27-django111] basepython=python2.7 deps = Django>=1.11,<1.12 {[base]deps} -[testenv:py34-django17] -basepython=python3.4 -deps = - Django>=1.7,<1.8 - {[base]deps} - -[testenv:py34-django18] -basepython=python3.4 -deps = - Django>=1.8,<1.9 - {[base]deps} - -[testenv:py35-django110] -basepython=python3.5 -deps = - Django>=1.10,<1.11 - {[base]deps} - [testenv:py35-django111] basepython=python3.5 deps = @@ -97,34 +61,10 @@ deps = Django>=1.11,<1.12 {[base]deps} -[testenv:py35-django20] -basepython=python3.5 -deps = - Django>=2.0,<2.1 - {[base]deps} - -[testenv:py36-django20] -basepython=python3.6 -deps = - Django>=2.0,<2.1 - {[base]deps} - -[testenv:py35-django21] -basepython=python3.5 -deps = - Django>=2.1,<2.2 - {[base]deps} - -[testenv:py36-django21] -basepython=python3.6 -deps = - Django>=2.1,<2.2 - {[base]deps} - -[testenv:py37-django21] +[testenv:py37-django111] basepython=python3.7 deps = - Django>=2.1,<2.2 + Django>=1.11,<1.12 {[base]deps} [testenv:py36-django22] @@ -145,6 +85,12 @@ deps = Django>=2.2,<3.0 {[base]deps} +[testenv:py39-django22] +basepython=python3.9 +deps = + Django>=2.2,<3.0 + {[base]deps} + [testenv:py36-django30] basepython=python3.6 deps = @@ -163,6 +109,36 @@ deps = Django>=3.0,<3.1 {[base]deps} +[testenv:py39-django30] +basepython=python3.9 +deps = + Django>=3.0,<3.1 + {[base]deps} + +[testenv:py36-django31] +basepython=python3.6 +deps = + Django>=3.1,<3.2 + {[base]deps} + +[testenv:py37-django31] +basepython=python3.7 +deps = + Django>=3.1,<3.2 + {[base]deps} + +[testenv:py38-django31] +basepython=python3.8 +deps = + Django>=3.1,<3.2 + {[base]deps} + +[testenv:py39-django31] +basepython=python3.9 +deps = + Django>=3.1,<3.2 + {[base]deps} + [testenv:flake8] basepython=python3