From 81272d53109f98da96689abfa10a9e6699c1b19f Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Thu, 6 Apr 2017 18:38:06 +1000
Subject: [PATCH] Update requirements for Django 1.11

This has long enough support to reach post conf + a fair bit.
---
 constraints.txt      | 10 ++++++++++
 pinaxcon/settings.py |  2 +-
 requirements.txt     | 14 ++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/constraints.txt b/constraints.txt
index 279d2209..366d261d 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -1 +1,11 @@
+django<1.12,>=1.11
 pysaml2==4.4.0
+django-countries>=4.3
+-e git+https://github.com/SmileyChris/easy-thumbnails.git@master#egg=easy_thumbnails
+-e git+https://github.com/nakato/django-sitetree.git@master#egg=django-sitetree
+-e git+https://github.com/nakato/django-model-utils.git@iter_class#egg=django-model-utils
+-e git+https://github.com/nakato/registrasion.git@master#egg=registrasion
+-e git+https://gitlab.com/lca2018/symposion.git@lca2018#egg=symposion
+-e git+https://github.com/chrisjrn/registrasion-stripe.git@master#egg=registrasion-stripe
+-e git+https://github.com/nakato/django-gapc-storage.git@master#egg=django-gapc-storage
+
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index b65fc2f9..32980c66 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -189,8 +189,8 @@ DEBUG_TOOLBAR_PANELS = [
     'debug_toolbar.panels.headers.HeadersPanel',
     'debug_toolbar.panels.request.RequestPanel',
     'debug_toolbar.panels.sql.SQLPanel',
-    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
     'debug_toolbar.panels.templates.TemplatesPanel',
+    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
     'debug_toolbar.panels.cache.CachePanel',
     'debug_toolbar.panels.signals.SignalsPanel',
     'debug_toolbar.panels.logging.LoggingPanel',
diff --git a/requirements.txt b/requirements.txt
index 9a8652c2..b70d36b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-# Should use latest 1.9 for security
-Django==1.9.7
+Django>=1.11
 pinax-theme-bootstrap==7.3.0
 metron==1.3.7
 pinax-eventlog==1.1.1
@@ -8,10 +7,10 @@ dj-static==0.0.6
 dj-database-url==0.4.0
 pylibmc==1.5.1
 raven==5.27.0
-django-debug-toolbar==1.6
+django-debug-toolbar>=1.7
 
 djangosaml2
--e git+https://github.com/nakato/django-gapc-storage.git@master#egg=django-gapc-storage
+django-gapc-storage
 
 # database
 mysqlclient>=1.3.3
@@ -19,7 +18,6 @@ mysqlclient>=1.3.3
 # For testing
 django-nose>=1.4.4
 coverage==4.0.3
-
--e git+https://gitlab.com/lca2018/symposion.git@lca2018#egg=symposion
--e git+https://github.com/chrisjrn/registrasion.git@master#egg=registrasion
--e git+https://github.com/chrisjrn/registrasion-stripe.git@master#egg=registrasion-stripe
+symposion
+registrasion
+registrasion-stripe