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] 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