Merge pull request #92 from kstateome/develop

1.5.2
kstateome · Sep 23, 2019 · 24bdec8 · 24bdec8
2 parents 2d2a202 + 148d8b7
commit 24bdec8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.5.2
+- Fix gateway feature (https://github.com/kstateome/django-cas/pull/91)
+
 ### 1.5.1
 - Include request in authenticate and evaluate gateway query_list (https://github.com/kstateome/django-cas/pull/87)
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -6,4 +6,5 @@ bltravis
 JordanReiter
 balsdorf
 kensler
-ryanbagwell
+ryanbagwell
+ptitloup
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.5.1
+Current version: 1.5.2
 
 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.5.1
+    pip install django-cas-client==1.5.2
 
 
 ### Add to URLs

diff --git a/cas/views.py b/cas/views.py
@@ -67,7 +67,7 @@ def _service_url(request, redirect_to=None, gateway=False):
                 for index, item2 in enumerate(gateway_params):
                     if item[0] == item2[0]:
                         gateway_params.pop(index)
-            extra_params = gateway_params + list(query_list)
+            extra_params = gateway_params + list(query_dict.items())
 
             #Sort params by key name so they are always in the same order.
             sorted_params = sorted(extra_params, key=itemgetter(0))

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.5.2
+------------------
+- Fix gateway feature (https://github.com/kstateome/django-cas/pull/91)
+
 1.5.1
 ------------------
 - Include request in authenticate and evaluate gateway query_list (https://github.com/kstateome/django-cas/pull/87)

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.5.1'
+version = '1.5.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.1'
+release = '1.5.2'
 
 # 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.5.1'
+version = '1.5.2'
 
 
 def read(fname):
@@ -13,6 +13,7 @@ def read(fname):
       version=version,
       description="Django Cas Client",
       long_description=read('README.md'),
+      long_description_content_type='text/markdown',
       classifiers=[
           "Development Status :: 5 - Production/Stable",
           "Environment :: Web Environment",