From 4025fcbf11405b0863c0c64b49d2bff4556a3089 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 2 Mar 2019 11:23:30 +0100
Subject: [PATCH] Add support for Django 2.1

---
 .travis.yml      |  4 ++++
 CHANGELOG.rst    |  5 +++++
 requirements.txt |  2 +-
 setup.py         |  3 ++-
 tox.ini          | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a81c37f..5b8a997 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,10 @@ matrix:
     env: TOX_ENV=py35-django20
   - python: "3.6"
     env: TOX_ENV=py36-django20
+  - python: "3.5"
+    env: TOX_ENV=py35-django21
+  - python: "3.6"
+    env: TOX_ENV=py36-django21
   - python: "2.7"
     env: TOX_ENV=coverage
 cache:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e0beb0a..3004bd7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ All notable changes to this project will be documented in this file.
 Unreleased
 ==========
 
+Added
+-----
+
+* Support for Django 2.1
+
 Fixes
 -----
 
diff --git a/requirements.txt b/requirements.txt
index 6e4edbe..95b36d9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django >= 1.11,<2.1
+Django >= 1.11,<2.2
 setuptools>=5.5
 requests>=2.4
 requests_futures>=0.9.5
diff --git a/setup.py b/setup.py
index 2e1d0ad..4c4af3b 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ if __name__ == '__main__':
             'Framework :: Django',
             'Framework :: Django :: 1.11',
             'Framework :: Django :: 2.0',
+            'Framework :: Django :: 2.1',
             'Intended Audience :: Developers',
             'Intended Audience :: System Administrators',
             'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
@@ -57,7 +58,7 @@ if __name__ == '__main__':
         },
         keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'],
         install_requires=[
-            'Django >= 1.11,<2.1', 'requests >= 2.4', 'requests_futures >= 0.9.5',
+            'Django >= 1.11,<2.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 1a1c2cf..ab93ef5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,8 @@ envlist=
     py36-django111,
     py35-django20,
     py36-django20,
+    py35-django21,
+    py36-django21,
 
 [flake8]
 max-line-length=100
@@ -104,6 +106,18 @@ deps =
     Django>=2.0,<2.1
     {[base]deps}
 
+[testenv:py35-django21]
+basepython=python3.5
+deps =
+    Django>=2.1,<2.2
+    {[base]deps}
+
+[testenv:py36-django21]
+basepython=python3.6
+deps =
+    Django>=2.1,<2.2
+    {[base]deps}
+
 
 
 [testenv:flake8]