From 1209c2cc68f2d5aa09fc460a1e4ae0051efb874e Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Mon, 17 Oct 2022 18:32:21 +0200 Subject: [PATCH] Restaure django 1.11 support as Ubuntu bionic is still maintained --- .travis.yml | 16 ++++++++++++++-- CHANGELOG.rst | 2 +- README.rst | 6 +++--- requirements.txt | 2 +- setup.py | 6 +++--- tox.ini | 13 +++++++------ 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a5b5f2..f41ca1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,25 +9,37 @@ matrix: env: TOX_ENV=check_rst - python: "3.9" env: TOX_ENV=coverage + # REHL 7 support and Ubuntu bionic + - python: "3.6" + env: TOX_ENV=py36-django111 + - python: "3.6" + env: TOX_ENV=py36-django111 + arch: ppc64le # RHEL 8 support - python: "3.6" env: TOX_ENV=py36-django22 - python: "3.6" env: TOX_ENV=py36-django22 arch: ppc64le + # Debian buster support + - python: "3.7" + env: TOX_ENV=py37-django111 + - python: "3.7" + env: TOX_ENV=py37-django111 + arch: ppc64le # Ubuntu focal and Ubuntu groovy support - python: "3.8" env: TOX_ENV=py38-django22 - python: "3.8" env: TOX_ENV=py38-django22 arch: ppc64le - # Debian bullseye and Ubuntu hirsute support + # Debian bullseye and Ubuntu hirsute and impish support - python: "3.9" env: TOX_ENV=py39-django22 - python: "3.9" env: TOX_ENV=py39-django22 arch: ppc64le - # Ubuntu jammy support + # Ubuntu jammy and kinetic support - python: "3.10" env: TOX_ENV=py310-django32 - python: "3.10" diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 458db3d..d58de00 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,8 +19,8 @@ Fixes Removed ------- -* Drop support for Django 1.11 (now deprecated for more than 2 years) * Drop support for python 2.7 (now deprecated for more than 2 years) +* Drop support for python 3.5 v1.3.1 - 2021-07-03 diff --git a/README.rst b/README.rst index cbeddc9..1b41d88 100644 --- a/README.rst +++ b/README.rst @@ -21,15 +21,15 @@ Features * Possibility to rename/rewrite attributes per service * Possibility to require some attribute values per service * Federated mode between multiple CAS -* Supports Django 2.2, 3.1 and 3.2 -* Supports Python 3.5+ +* Supports Django 1.11, 2.2, 3.2, 4.1 and 4.2 +* Supports Python 3.6+ Dependencies ============ ``django-cas-server`` depends on the following python packages: -* Django >= 2.2 < 4.2 +* Django >= 1.11 < 4.2 * requests >= 2.4 * requests_futures >= 0.9.5 * lxml >= 3.4 diff --git a/requirements.txt b/requirements.txt index 2c5e959..ced9200 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django >= 2.2,<3.3 +Django >= 1.11,<3.3 setuptools>=5.5 requests>=2.4 requests_futures>=0.9.5 diff --git a/setup.py b/setup.py index 56b0bf9..53d2b14 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ if __name__ == '__main__': 'Environment :: Web Environment', 'Development Status :: 5 - Production/Stable', 'Framework :: Django', + 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.1', 'Framework :: Django :: 3.2', @@ -39,14 +40,13 @@ if __name__ == '__main__': 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', @@ -61,7 +61,7 @@ if __name__ == '__main__': }, keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'], install_requires=[ - 'Django >= 2.2,<4.2', 'requests >= 2.4', 'requests_futures >= 0.9.5', + 'Django >= 1.11,<4.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 befd910..8838364 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist= flake8, check_rst, + py3-django111, py3-django22, py3-django31, py3-django32, @@ -179,9 +180,9 @@ deps = Django>=2.2,<3.0 {[base]deps} -############################################## -# Debian bullseye and Ubuntu hirsute support # -############################################## +######################################################### +# Debian bullseye and Ubuntu hirsute and impish support # +######################################################### [testenv:py39-django22] basepython=python3.9 @@ -189,9 +190,9 @@ deps = Django>=2.2,<3.0 {[base]deps} -######################## -# Ubuntu jammy support # -######################## +#################################### +# Ubuntu jammy and kinetic support # +#################################### [testenv:py310-django32] basepython=python3.10