From 19d41e73e611310d6fb5a6d0a8f6c124dfa9e4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Thu, 23 Jun 2016 08:57:06 -0400
Subject: [PATCH] Test against Django master

---
 .travis.yml | 4 ++++
 tox.ini     | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7073c3d0c..58460398b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,10 @@ env:
 
 matrix:
     fast_finish: true
+    allow_failures:
+      - TOX_ENV=py27-djangomaster
+      - TOX_ENV=py34-djangomaster
+      - TOX_ENV=py35-djangomaster
 
 install:
     # Virtualenv < 14 is required to keep the Python 3.2 builds running.
diff --git a/tox.ini b/tox.ini
index 1b2c902c3..1a160a299 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,8 @@ envlist =
        py27-{lint,docs},
        {py27,py32,py33,py34,py35}-django18,
        {py27,py34,py35}-django19,
-       {py27,py34,py35}-django110
+       {py27,py34,py35}-django110,
+       {py27,py34,py35}-django{master}
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
@@ -17,6 +18,7 @@ deps =
         django18: Django==1.8.13
         django19: Django==1.9.7
         django110: Django==1.10b1
+        djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt
 basepython =