From 6557e2983b6854e37267ca544816c2132f1b2b82 2017-03-31 00:54:47 From: Sachi King Date: 2017-03-31 00:54:47 Subject: [PATCH] Support Django 1.10 Few minor changes to support Django 1.10 --- diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 3297aa2b1f39c8c6e3f85fd7d7ddd49ba43bf194..5e2eb3442808805c3fcb542f8e4926c0ff7b3d5d 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -63,12 +63,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", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", diff --git a/requirements.txt b/requirements.txt index 240bf7eb57ef6fbefb245b38e89cc4d6beb87154..9a8652c2f72eed76c91aa5d687632fbb6003f7d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ djangosaml2 mysqlclient>=1.3.3 # For testing -django-nose==1.4.3 +django-nose>=1.4.4 coverage==4.0.3 -e git+https://gitlab.com/lca2018/symposion.git@lca2018#egg=symposion