From 70b4be757d671bc86876b4568632bb6fe6064001 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Fri, 9 Jun 2017 15:12:00 +0100
Subject: [PATCH 1/5] Fix a Django deprecation warning

Replace deprecated assignment_tag:

`python/lib/python3.5/site-packages/admin_interface/templatetags/admin_interface_tags.py:11: RemovedInDjango20Warning: assignment_tag() is deprecated. Use simple_tag() instead`
---
 admin_interface/templatetags/admin_interface_tags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin_interface/templatetags/admin_interface_tags.py b/admin_interface/templatetags/admin_interface_tags.py
index b6d3eb9..376055c 100644
--- a/admin_interface/templatetags/admin_interface_tags.py
+++ b/admin_interface/templatetags/admin_interface_tags.py
@@ -8,7 +8,7 @@ from admin_interface.models import Theme
 register = template.Library()
 
 
-@register.assignment_tag(takes_context = True)
+@register.simple_tag(takes_context = True)
 def get_admin_interface_theme(context):
 
     theme = None

From 09bd082759d7094e82f4ee5609691da7f26a3766 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Fri, 9 Jun 2017 15:44:23 +0100
Subject: [PATCH 2/5] Fix the error on older versions of Django

---
 admin_interface/templatetags/admin_interface_tags.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin_interface/templatetags/admin_interface_tags.py b/admin_interface/templatetags/admin_interface_tags.py
index 376055c..5435089 100644
--- a/admin_interface/templatetags/admin_interface_tags.py
+++ b/admin_interface/templatetags/admin_interface_tags.py
@@ -7,8 +7,13 @@ from admin_interface.models import Theme
 
 register = template.Library()
 
+try:
+    assignment_tag = register.assignment_tag
+except AttributeError:
+    assignment_tag = register.simple_tag
 
-@register.simple_tag(takes_context = True)
+
+@assignment_tag(takes_context = True)
 def get_admin_interface_theme(context):
 
     theme = None

From 78d80bc129507b82c60731954e6feae6f28b71be Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Fri, 9 Jun 2017 15:49:54 +0100
Subject: [PATCH 3/5] Run tests against Django master

---
 .travis.yml | 8 +++++++-
 tox.ini     | 9 +++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 78ede45..55b9f76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,20 @@ env:
   - TOX_ENV=py34-18
   - TOX_ENV=py34-19
   - TOX_ENV=py34-110
+  - TOX_ENV=py34-master
   - TOX_ENV=py35-18
   - TOX_ENV=py35-19
   - TOX_ENV=py35-110
+  - TOX_ENV=py35-master
   #- TOX_ENV=py36-18
   #- TOX_ENV=py36-19
   #- TOX_ENV=py36-110
+matrix:
+  allow_failures:
+    - env: TOX_ENV=py34-master
+    - env: TOX_ENV=py34-master
 install:
   - pip install tox
 script:
   - tox -e $TOX_ENV
-sudo: false
\ No newline at end of file
+sudo: false
diff --git a/tox.ini b/tox.ini
index 8062161..5eca63e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111},
-    py35-{18,19,110,111},
-    py36-{18,19,110,111},
+    py34-{17,18,19,110,111,master},
+    py35-{18,19,110,111,master},
+    py36-{18,19,110,111,master},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -12,9 +12,10 @@ deps =
     19: Django >= 1.9, < 1.10
     110: Django >= 1.10, < 1.11
     111: Django >= 1.11, < 1.12
+    master: https://github.com/django/django/archive/master.tar.gz
     coverage
     codecov
 commands =
     coverage run --append --source=admin_interface setup.py test
     coverage report -m
-    codecov
\ No newline at end of file
+    codecov

From d0f8d7514a511c21a45981bf8840084bcb0b5c14 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Fri, 9 Jun 2017 15:56:05 +0100
Subject: [PATCH 4/5] Fix allow_failures

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 55b9f76..111dd0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ env:
 matrix:
   allow_failures:
     - env: TOX_ENV=py34-master
-    - env: TOX_ENV=py34-master
+    - env: TOX_ENV=py35-master
 install:
   - pip install tox
 script:

From 511ad909bfac3328fd28a2a8bbf46bf773d145e9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Fri, 9 Jun 2017 16:27:13 +0100
Subject: [PATCH 5/5] Run tests on Python 3.6 for Django 1.11+

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 111dd0d..58943b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,16 @@ env:
   - TOX_ENV=py35-19
   - TOX_ENV=py35-110
   - TOX_ENV=py35-master
-  #- TOX_ENV=py36-18
-  #- TOX_ENV=py36-19
-  #- TOX_ENV=py36-110
 matrix:
+  include:
+    - python: "3.6"
+      env: TOX_ENV=py36-111
+    - python: "3.6"
+      env: TOX_ENV=py36-master
   allow_failures:
     - env: TOX_ENV=py34-master
     - env: TOX_ENV=py35-master
+    - env: TOX_ENV=py36-master
 install:
   - pip install tox
 script: