Merge pull request #41 from nitmir/dev

Update version to 1.0.0

.travis.yml

@@ -6,27 +6,15 @@ matrix:
   - python: "2.7"
     env: TOX_ENV=check_rst
   - python: "2.7"
-    env: TOX_ENV=py27-django17
-  - python: "2.7"
-    env: TOX_ENV=py27-django18
-  - python: "2.7"
-    env: TOX_ENV=py27-django19
-  - python: "2.7"
-    env: TOX_ENV=py27-django110
-  - python: "3.4"
-    env: TOX_ENV=py34-django17
-  - python: "3.4"
-    env: TOX_ENV=py34-django18
-  - python: "3.4"
-    env: TOX_ENV=py34-django19
-  - python: "3.4"
-    env: TOX_ENV=py34-django110
-  - python: "3.5"
-    env: TOX_ENV=py35-django18
+    env: TOX_ENV=py27-django111
   - python: "3.5"
-    env: TOX_ENV=py35-django19
+    env: TOX_ENV=py35-django111
+  - python: "3.6"
+    env: TOX_ENV=py36-django111
   - python: "3.5"
-    env: TOX_ENV=py35-django110
+    env: TOX_ENV=py35-django20
+  - python: "3.6"
+    env: TOX_ENV=py36-django20
   - python: "2.7"
     env: TOX_ENV=coverage
 cache:

CHANGELOG.rst

@@ -7,6 +7,39 @@ All notable changes to this project will be documented in this file.
    :depth: 2
 
 
+v1.0.0 - 2019-01-12
+===================
+
+Added
+-----
+* Support for python 3.6 and Django 1.11
+* Support for Django 2.0
+* Keep query string then redirecting from / to /login
+
+Fixes
+-----
+
+* Add missing attributes authenticationDate, longTermAuthenticationRequestTokenUsed and
+  isFromNewLogin from service validation response
+* Catch error from calling django.contrib.staticfiles.templatetags.staticfiles.static
+  in non-debug mode before collectstatic in cas_server.default_settings.py
+* Invalid escape sequence in regular expression
+
+Deprecated
+----------
+
+* Support for Django <1.11 is dropped, it should still works for this version.
+  Next versions will most probably be not compatible with Django <1.11
+* Support for python 3.4 is dropped, it should still works for this version.
+  Next versions may or may not works with python 3.4.
+
+Other
+-----
+
+* Migrations have been squashed for Django 2.0 support. Be sur to apply all migration before
+  updating to this version
+* Update PyPi url from https://pypi.python.org to https://pypi.org
+
 v0.9.0 - 2017-11-17
 ===================
 
@@ -28,7 +61,6 @@ Fixed
 * Fix XSS js injection
 
 
-
 v0.8.0 - 2017-03-08
 ===================
 

Makefile

@@ -37,8 +37,8 @@ dist:
 	python setup.py sdist
 
 test_venv/bin/python:
-	virtualenv test_venv
-	test_venv/bin/pip install -U --requirement requirements-dev.txt 'Django<1.11'
+	python3 -m venv test_venv
+	test_venv/bin/pip install -U --requirement requirements-dev.txt 'Django>=2.0,<2.1'
 
 test_venv/cas/manage.py: test_venv
 	mkdir -p test_venv/cas

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 1.7, 1.8 and 1.9
-* Supports Python 2.7, 3.x
+* Supports Django 1.11 and 2.0
+* Supports Python 2.7, 3.5+
 
 Dependencies
 ============
 
 ``django-cas-server`` depends on the following python packages:
 
-* Django >= 1.7.1 < 1.11
+* Django >= 1.11 < 2.1
 * requests >= 2.4
 * requests_futures >= 0.9.5
 * lxml >= 3.4
@@ -645,7 +645,7 @@ You could for example do as bellow::
     :target: https://travis-ci.org/nitmir/django-cas-server
 
 .. |pypi_version| image:: https://badges.genua.fr/pypi/v/django-cas-server.svg
-    :target: https://pypi.python.org/pypi/django-cas-server
+    :target: https://pypi.org/project/django-cas-server/
 
 .. |github_version| image:: https://badges.genua.fr/github/tag/nitmir/django-cas-server.svg?label=github
     :target: https://github.com/nitmir/django-cas-server/releases/latest

cas_server/__init__.py

@@ -11,7 +11,7 @@
 """A django CAS server application"""
 
 #: version of the application
-VERSION = '0.9.0'
+VERSION = '1.0.0'
 
 #: path the the application configuration class
 default_app_config = 'cas_server.apps.CasAppConfig'

cas_server/cas.py

@@ -206,7 +206,7 @@ def get_verification_response(self, ticket):
     def parse_attributes_xml_element(cls, element, charset):
         attributes = dict()
         for attribute in element:
-            tag = cls.self.u(attribute.tag, charset).split(u"}").pop()
+            tag = cls.u(attribute.tag, charset).split(u"}").pop()
             if tag in attributes:
                 if isinstance(attributes[tag], list):
                     attributes[tag].append(cls.u(attribute.text, charset))

cas_server/default_settings.py

@@ -17,10 +17,20 @@
 from importlib import import_module
 
 
-#: URL to the logo showed in the up left corner on the default templates.
-CAS_LOGO_URL = static("cas_server/logo.png")
-#: URL to the favicon (shortcut icon) used by the default templates. Default is a key icon.
-CAS_FAVICON_URL = static("cas_server/favicon.ico")
+try:
+    #: URL to the logo showed in the up left corner on the default templates.
+    CAS_LOGO_URL = static("cas_server/logo.png")
+    #: URL to the favicon (shortcut icon) used by the default templates. Default is a key icon.
+    CAS_FAVICON_URL = static("cas_server/favicon.ico")
+# is settings.DEBUG is False and collectstatics has not been run yet, the static function will
+# raise a ValueError because the file is not found.
+except ValueError:
+    #: URL to the logo showed in the up left corner on the default templates.
+    CAS_LOGO_URL = None
+    #: URL to the favicon (shortcut icon) used by the default templates. Default is a key icon.
+    CAS_FAVICON_URL = None
+
+
 #: Show the powered by footer if set to ``True``
 CAS_SHOW_POWERED = True
 #: URLs to css and javascript external components.
@@ -183,7 +193,7 @@
 CAS_NEW_VERSION_EMAIL_WARNING = True
 #: URL to the pypi json of the application. Used to retreive the version number of the last version.
 #: You should not change it.
-CAS_NEW_VERSION_JSON_URL = "https://pypi.python.org/pypi/django-cas-server/json"
+CAS_NEW_VERSION_JSON_URL = "https://pypi.org/pypi/django-cas-server/json"
 
 #: If the service message should be displayed on the login page
 CAS_SHOW_SERVICE_MESSAGES = True