From f92060d84219cb7b1c56f6c73fa5e77d42ab2c67 Mon Sep 17 00:00:00 2001
From: Frank Hamand <frankhamand@gmail.com>
Date: Thu, 4 May 2017 12:26:42 +0100
Subject: [PATCH] Update to django 1.11

Last time we tried this django-polymorphic didn't support it so we
had to roll back. It's now been updated so we can go ahead
---
 CHANGES          | 5 +++++
 Pipfile          | 2 +-
 requirements.txt | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index ca7cb84..0ddd9ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+master
+------
+
+* Update to django 1.11 (with working django-polymorphic this time)
+
 Version 0.10.7
 --------------
 
diff --git a/Pipfile b/Pipfile
index 9820cda..ff32bed 100644
--- a/Pipfile
+++ b/Pipfile
@@ -23,7 +23,7 @@ requests = "*"
 twilio = ">=5,<6"
 whitenoise = "*"
 coreapi = "*"
-Django = ">=1.10,<1.11"
+Django = ">=1.11,<2"
 django_polymorphic = "*"
 django_compressor = "*"
 Markdown = "*"
diff --git a/requirements.txt b/requirements.txt
index efecf24..03e4d66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,13 +6,13 @@ celery==4.0.2
 coreapi==2.3.0
 coreschema==0.0.4
 dj-database-url==0.4.2
-Django==1.10.7
+Django==1.11
 django-appconf==1.0.2
-django-auth-ldap==1.2.10
+django-auth-ldap==1.2.11
 django-compressor==2.1.1
 django-filter==1.0.2
 django-jsonify==0.3.0
-django-polymorphic==1.1
+django-polymorphic==1.2
 djangorestframework==3.6.2
 freezegun==0.3.8
 gevent==1.2.1