Merge pull request #20 from founders4schools/deprecation-warnings

Fix a Django deprecation warning

.travis.yml

@@ -9,14 +9,23 @@ 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=py36-18
+  - TOX_ENV=py35-master
-  #- TOX_ENV=py36-19
+matrix:
-  #- TOX_ENV=py36-110
+  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:
   - tox -e $TOX_ENV
-sudo: false
+sudo: false

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.assignment_tag(takes_context = True)
+
+@assignment_tag(takes_context = True)
 def get_admin_interface_theme(context):
 
     theme = None

tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111},
+    py34-{17,18,19,110,111,master},
-    py35-{18,19,110,111},
+    py35-{18,19,110,111,master},
-    py36-{18,19,110,111},
+    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
+    codecov