From 8bed2e61294debb5ff12ca53e207cb7bb767de59 Mon Sep 17 00:00:00 2001 From: Rowan Seymour Date: Mon, 5 Jun 2017 10:57:04 +0200 Subject: [PATCH 1/2] Add support and testing for Django 1.11 and Python 3.6 --- .travis.yml | 5 +++-- README.md | 2 +- requirements/base.txt | 2 +- smartmin/email.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb5a4a3..05317da 100644 --- 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 index 95bfb17..e4b545e 100644 --- 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 index 80664a9..545db41 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ celery -django>=1.8,<2.0 +django>=1.9,<2.0 django-guardian django_compressor pytz diff --git a/smartmin/email.py b/smartmin/email.py index 72cdacf..2ac6f7a 100644 --- a/smartmin/email.py +++ b/smartmin/email.py @@ -13,7 +13,7 @@ def link_components(request, user=None): def build_email_context(request=None, user=None): - context = Context({'user': user}) + context = {'user': user} processors = [] collect = [] From 62f99645c5c7dfa8b64d1df0332fe0f5e3a63b4b Mon Sep 17 00:00:00 2001 From: Rowan Seymour Date: Mon, 5 Jun 2017 10:59:07 +0200 Subject: [PATCH 2/2] Remove unused import --- smartmin/email.py | 1 - 1 file changed, 1 deletion(-) diff --git a/smartmin/email.py b/smartmin/email.py index 2ac6f7a..0502e4e 100644 --- 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