Merge pull request #78 from kstateome/develop

1.5.0
kstateome · Jan 9, 2019 · 0fd17f6 · 0fd17f6
2 parents 697448b + 8a87109
commit 0fd17f6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.5.0
+- Path Change (https://github.com/kstateome/django-cas/pull/76)
+- Update authenticate method (https://github.com/kstateome/django-cas/pull/77/files)
+
 ### 1.4.0
 - Compatibility with Django 2.0 (https://github.com/kstateome/django-cas/pull/72)
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -5,3 +5,5 @@ cordmata
 bltravis
 JordanReiter
 balsdorf
+kensler
+ryanbagwell
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 CAS client for Django.  This library requires Django 1.5 or above, and Python 2.6, 2.7, 3.4
 
-Current version: 1.4.0
+Current version: 1.5.0
 
 This is [K-State&#39;s fork](https://github.com/kstateome/django-cas) of [the original](https://bitbucket.org/cpcc/django-cas/overview) and includes [several additional features](https://github.com/kstateome/django-cas/#additional-features) as well as features merged from
 
@@ -14,7 +14,7 @@ This is [K-State&#39;s fork](https://github.com/kstateome/django-cas) of [the or
 
 This project is registered on PyPi as django-cas-client.  To install::
 
-    pip install django-cas-client==1.4.0
+    pip install django-cas-client==1.5.0
 
 
 ### Add to URLs

diff --git a/cas/backends.py b/cas/backends.py
@@ -221,7 +221,7 @@ class CASBackend(object):
     supports_object_permissions = False
     supports_inactive_user = False
 
-    def authenticate(self, ticket, service):
+    def authenticate(self, request, ticket, service):
         """
         Verifies CAS ticket and gets or creates User object
         NB: Use of PT to identify proxy

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.5.0
+------------------
+- Path Change (https://github.com/kstateome/django-cas/pull/76)
+- Update authenticate method (https://github.com/kstateome/django-cas/pull/77/files)
+
 1.4.0
 ------------------
 - Compatibility with Django 2.0 (https://github.com/kstateome/django-cas/pull/72)

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4.0'
+version = '1.5.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.0'
+release = '1.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = '1.4.0'
+version = '1.5.0'
 
 
 def read(fname):