Merge branch 'master' into no_more_guardian

nyaruka · Jun 5, 2017 · 0f2eb7d · 0f2eb7d
2 parents fe61214 + eb63627
commit 0f2eb7d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,11 @@ python:
  - "2.7"
  - "3.4"
  - "3.5"
+ - "3.6"
 env:
- - DJANGO_VERSION=1.8.16
  - DJANGO_VERSION=1.9.11
- - DJANGO_VERSION=1.10.4
+ - DJANGO_VERSION=1.10.5
+ - DJANGO_VERSION=1.11.2
 install:
  - pip install -q -rrequirements/base.txt
  - pip install -q -rrequirements/tests.txt

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Smartmin tries to stay in lock step with the latest Django versions. With each n
 will be released and we will save the major changes (possibly breaking backwards compatibility) on these versions.  This 
 includes updating to the latest version of Twitter Bootstrap.
 
-The latest version is the 1.10.* series which works against Django 1.8, 1.9 and 1.10.
+The latest version is the 1.11.* series which works against Django 1.9, 1.10 and 1.11.
 
 About
 =====

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,5 +1,5 @@
 celery
-django>=1.8,<2.0
+django>=1.9,<2.0
 django_compressor
 pytz
 redis

diff --git a/smartmin/email.py b/smartmin/email.py
@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 from django.conf import settings
-from django.template import Context
 from django.utils.module_loading import import_string
 
 
@@ -13,7 +12,7 @@ def link_components(request, user=None):
 
 
 def build_email_context(request=None, user=None):
-    context = Context({'user': user})
+    context = {'user': user}
 
     processors = []
     collect = []