From fa46fb07d648280ea5b224cde9284fec72990414 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Wed, 9 Aug 2017 21:07:55 -0700
Subject: [PATCH] Upgrades django to 1.11

---
 pinaxcon/registrasion/urls.py |  7 +++----
 pinaxcon/settings.py          | 12 ++++++------
 pinaxcon/urls.py              |  2 +-
 requirements/base.txt         |  9 ++++++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pinaxcon/registrasion/urls.py b/pinaxcon/registrasion/urls.py
index e609e52..4399808 100644
--- a/pinaxcon/registrasion/urls.py
+++ b/pinaxcon/registrasion/urls.py
@@ -1,8 +1,7 @@
-from django.conf.urls import url, patterns
+from django.conf.urls import url
 
 import views
 
-urlpatterns = patterns(
-    "pinaxcon.registrasion.views",
+urlpatterns = [
     url(r"^demopay/([0-9]+)/([A-Z0-9]+)$", views.demopay, name="demopay"),
-)
+]
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index b78e7ac..d1e0f0f 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -94,12 +94,12 @@ TEMPLATES = [
             "debug": DEBUG,
             "context_processors": [
                 "django.contrib.auth.context_processors.auth",
-                "django.core.context_processors.debug",
-                "django.core.context_processors.i18n",
-                "django.core.context_processors.media",
-                "django.core.context_processors.static",
-                "django.core.context_processors.tz",
-                "django.core.context_processors.request",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "django.template.context_processors.request",
                 "django.contrib.messages.context_processors.messages",
                 "account.context_processors.account",
                 "pinax_theme_bootstrap.context_processors.theme",
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 8837448..58fa200 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.views.generic import TemplateView
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 5ac2679..2fb7510 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-Django==1.9.2
+Django>=1.11,<1.12
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
@@ -9,11 +9,14 @@ pinax-pages==0.4.2
 pinax-boxes==2.1.2
 django-libsass==0.7
 django-markdown-deux==1.0.5
-
+django-sitetree==1.8.0
+django-countries==4.6.1
+easy-thumbnails==2.4.1
+django-timezone-field==2.0
 
 
 # For testing
-django-nose==1.4.3
+django-nose==1.4.4
 coverage==4.0.3
 
 # Registrasion