Merge pull request #74 from nitmir/dev

Update to version 1.3.0 v1.3.0 - 2021-06-19 =================== Added ----- * Support for Dango 3.1 and 3.2 * Implement CAS_LDAP_ATTRS_VIEW set to 0: then using ldap bind mode, user attributes can be retreive either using CAS_LDAP_USER or using the binded user credentials. * Added ppc64le architecture support on travis-ci (django-cas-server is included in the ppc64le versions of RHEL and Ubuntu) * Python 3.9 support Fixes ----- * Allow to use user attributes if auth by ldap bind * Fix spelling mistakes in french translation * Fix bug model datefield Form (Federated User Admin) * django.conf.urls is deprecated and will be removed in Django 4.0. Use django.urls.re_path instead Removed ------- * Drop support for Django 3.0 as it reached end of life.
nitmir · Jun 19, 2021 · d010e75 · d010e75
2 parents f15d0fa + 8ca36f6
commit d010e75
Show file tree

Hide file tree

Showing 18 changed files with 317 additions and 251 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ before_script:
 - pip install tox setuptools
 
 flake8:
-  image: "python:2.7"
+  image: "python:3.9"
   cache:
     key: flake8
     paths:
@@ -11,115 +11,106 @@ flake8:
   - tox -e flake8
 
 check_rst:
-  image: "python:2.7"
+  image: "python:3.9"
   cache:
     key: check_rst
     paths:
     - .tox/check_rst
   script:
   - tox -e check_rst
 
-py27-django17:
-  image: "python:2.7"
-  cache:
-    key: py27-django17
-    paths:
-    - .tox/py27-django17
-  script:
-  - tox -e py27-django17
-
-py27-django18:
+py27-django111:
   image: "python:2.7"
   cache:
-    key: py27-django18
+    key: py27-django111
     paths:
-    - .tox/py27-django18
+    - .tox/py27-django111
   script:
-  - tox -e py27-django18
+  - tox -e py27-django111
 
-py27-django19:
-  image: "python:2.7"
+py35-django111:
+  image: "python:3.5"
   cache:
-    key: py27-django19
+    key: py35-django111
     paths:
-    - .tox/py27-django19
+    - .tox/py35-django111
   script:
-  - tox -e py27-django19
+  - tox -e py35-django111
 
-py27-django110:
-  image: "python:2.7"
+py36-django111:
+  image: "python:3.6"
   cache:
-    key: py27-django110
+    key: py36-django111
     paths:
-    - .tox/py27-django110
+    - .tox/py36-django111
   script:
-  - tox -e py27-django110
+  - tox -e py36-django111
 
-py34-django17:
-  image: "python:3.4"
+py37-django22:
+  image: "python:3.7"
   cache:
-    key: py34-django17
+    key: py37-django22
     paths:
-    - .tox/py34-django17
+    - .tox/py37-django22
   script:
-  - tox -e py34-django17
+  - tox -e py37-django22
 
-py34-django18:
-  image: "python:3.4"
+py38-django22:
+  image: "python:3.8"
   cache:
-    key: py34-django18
+    key: py38-django22
     paths:
-    - .tox/py34-django18
+    - .tox/py38-django22
   script:
-  - tox -e py34-django18
+  - tox -e py38-django22
 
-py34-django19:
-  image: "python:3.4"
+py38-django30:
+  image: "python:3.8"
   cache:
-    key: py34-django19
+    key: py38-django30
     paths:
-    - .tox/py34-django19
+    - .tox/py38-django30
   script:
-  - tox -e py34-django19
+  - tox -e py38-django30
 
-py34-django110:
-  image: "python:3.4"
+py38-django31:
+  image: "python:3.8"
   cache:
-    key: py34-django110
+    key: py38-django31
     paths:
-    - .tox/py34-django110
+    - .tox/py38-django31
   script:
-  - tox -e py34-django110
+  - tox -e py38-django31
 
-py35-django18:
-  image: "python:3.5"
+py39-django22:
+  image: "python:3.9"
   cache:
-    key: py35-django18
+    key: py39-django22
     paths:
-    - .tox/py35-django18
+    - .tox/py39-django22
   script:
-  - tox -e py35-django18
+  - tox -e py39-django22
 
-py35-django19:
-  image: "python:3.5"
+py39-django30:
+  image: "python:3.9"
   cache:
-    key: py35-django19
+    key: py39-django30
     paths:
-    - .tox/py35-django19
+    - .tox/py39-django30
   script:
-  - tox -e py35-django19
+  - tox -e py39-django30
 
-py35-django110:
-  image: "python:3.5"
+py39-django31:
+  image: "python:3.9"
   cache:
-    key: py35-django110
+    key: py39-django31
     paths:
-    - .tox/py35-django110
+    - .tox/py39-django31
   script:
-  - tox -e py35-django110
+  - tox -e py39-django31
 
 coverage:
-  image: "python:2.7"
+  image: "python:3.9"
   cache:
     key: coverage
     paths:

diff --git a/.travis.yml b/.travis.yml
@@ -1,39 +1,63 @@
 language: python
 matrix:
   include:
-  - python: "3.8"
+  # generic checks
+  - python: "3.9"
     env: TOX_ENV=flake8
-  - python: "3.8"
+  - python: "3.9"
     env: TOX_ENV=check_rst
-  - python: "2.7"
-    env: TOX_ENV=py27-django111
+  - python: "3.9"
+    env: TOX_ENV=coverage
+  # Debian strech support
   - python: "3.5"
     env: TOX_ENV=py35-django111
+  - python: "3.5"
+    env: TOX_ENV=py35-django111
+    arch: ppc64le
+  # Ubuntu bionic and EPEL 7 support
   - python: "3.6"
     env: TOX_ENV=py36-django111
-  - python: "3.5"
-    env: TOX_ENV=py35-django20
   - python: "3.6"
-    env: TOX_ENV=py36-django20
-  - python: "3.5"
-    env: TOX_ENV=py35-django21
+    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-django21
+    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-django22
+    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-django30
-  - python: "3.8"
-    env: TOX_ENV=coverage
+    env: TOX_ENV=py38-django22
+    arch: ppc64le
+  # Debian bullseye and Ubuntu hirsute support
+  - python: "3.9"
+    env: TOX_ENV=py39-django22
+  - python: "3.9"
+    env: TOX_ENV=py39-django22
+    arch: ppc64le
+  # Django additional supported version
+  - python: "3.9"
+    env: TOX_ENV=py39-django31
+  - python: "3.9"
+    env: TOX_ENV=py39-django32
+
 cache:
   directories:
     - $HOME/.cache/pip/http/
     - $HOME/build/nitmir/django-cas-server/.tox/$TOX_ENV/
 install:
-  - "travis_retry pip install setuptools --upgrade"
-  - "pip install tox"
+  - travis_retry pip install setuptools --upgrade
+  - pip install tox $PKGS
+  - pip freeze
 script:
   - tox -e $TOX_ENV
 after_script:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,34 @@ All notable changes to this project will be documented in this file.
 .. contents:: Table of Contents
    :depth: 2
 
+v1.3.0 - 2021-06-19
+===================
+
+Added
+-----
+
+* Support for Dango 3.1 and 3.2
+* Implement CAS_LDAP_ATTRS_VIEW set to 0: then using ldap bind mode, user
+  attributes can be retreive either using CAS_LDAP_USER or using the
+  binded user credentials.
+* Added ppc64le architecture support on travis-ci (django-cas-server is
+  included in the ppc64le versions of RHEL and Ubuntu)
+* Python 3.9 support
+
+Fixes
+-----
+
+* Allow to use user attributes if auth by ldap bind
+* Fix spelling mistakes in french translation
+* Fix bug model datefield Form (Federated User Admin)
+* django.conf.urls is deprecated and will be removed in Django 4.0.
+  Use django.urls.re_path instead
+
+Removed
+-------
+
+* Drop support for Django 3.0 as it reached end of life.
+
 v1.2.0 - 2020-07-05
 ===================
 

diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 .PHONY: build dist docs
-VERSION=`python setup.py -V`
+VERSION=`python3 setup.py -V`
 
 build:
-	python setup.py build
+	python3 setup.py build
 
 install: dist
-	pip -V
-	pip install --no-cache-dir --no-deps --upgrade --force-reinstall --find-links ./dist/django-cas-server-${VERSION}.tar.gz django-cas-server
+	pip3 -V
+	pip3 install --no-cache-dir --no-deps --upgrade --force-reinstall --find-links ./dist/django-cas-server-${VERSION}.tar.gz django-cas-server
 
 uninstall:
-	pip uninstall django-cas-server || true
+	pip3 uninstall django-cas-server || true
 
 clean_pyc:
 	find ./ -name '*.pyc' -delete
@@ -34,11 +34,11 @@ clean: clean_pyc clean_build clean_coverage clean_tild_backup
 clean_all: clean clean_tox clean_test_venv clean_docs clean_eggs
 
 dist:
-	python setup.py sdist
+	python3 setup.py sdist
 
 test_venv/bin/python:
 	python3 -m venv test_venv
-	test_venv/bin/pip install -U --requirement requirements-dev.txt 'Django>=2.0,<2.1'
+	test_venv/bin/pip install -U --requirement requirements-dev.txt 'Django>=3.2,<3.3'
 
 test_venv/cas/manage.py: test_venv
 	mkdir -p test_venv/cas
@@ -61,7 +61,7 @@ run_server: test_project
 	test_venv/bin/python test_venv/cas/manage.py runserver
 
 run_tests: test_venv
-	python setup.py check --restructuredtext --stric
+	python3 setup.py check --restructuredtext --stric
 	test_venv/bin/py.test -rw -x --cov=cas_server --cov-report html --cov-report term
 	rm htmlcov/coverage_html.js  # I am really pissed off by those keybord shortcuts
 
@@ -72,4 +72,4 @@ docs: test_venv/bin/sphinx-build
 	bash -c "source test_venv/bin/activate; cd docs; make html"
 
 publish_pypi_release:
-	python setup.py sdist bdist_wheel upload --sign
+	python3 setup.py sdist bdist_wheel upload --sign