From 785bf22dd30e41416122da2df0eb0a56c21e0a53 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 29 Sep 2015 22:48:10 +0200
Subject: [PATCH 1/2] Travis/tox: use dj19 tarball, add master; remove
 unsupported

 - Add `allow_failures` section for Django master on Travis.
 - Django 1.9 is only supported on Python 2.7 and 3.4+.
---
 .travis.yml | 16 ++++++++++++++--
 tox.ini     |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e2dcfd4..831b3ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,26 +26,38 @@ env:
     - TOXENV=py27-dj17
     - TOXENV=py27-dj18
     - TOXENV=py27-dj19
+    - TOXENV=py27-djmaster
     - TOXENV=py32-dj15
     - TOXENV=py32-dj16
     - TOXENV=py32-dj17
     - TOXENV=py32-dj18
-    - TOXENV=py32-dj19
     - TOXENV=py33-dj15
     - TOXENV=py33-dj16
     - TOXENV=py33-dj17
     - TOXENV=py33-dj18
-    - TOXENV=py33-dj19
     - TOXENV=py34-dj15
     - TOXENV=py34-dj16
     - TOXENV=py34-dj17
     - TOXENV=py34-dj18
     - TOXENV=py34-dj19
+    - TOXENV=py34-djmaster
+    - TOXENV=py35-dj15
+    - TOXENV=py35-dj16
+    - TOXENV=py35-dj17
+    - TOXENV=py35-dj18
+    - TOXENV=py35-dj19
+    - TOXENV=py35-djmaster
     - TOXENV=pypy-dj15
     - TOXENV=pypy-dj16
     - TOXENV=pypy-dj17
     - TOXENV=pypy-dj18
     - TOXENV=pypy-dj19
+    - TOXENV=pypy-djmaster
+  allow_failures:
+    - TOXENV=py27-djmaster
+    - TOXENV=py34-djmaster
+    - TOXENV=py35-djmaster
+    - TOXENV=pypy-djmaster
 install:
   - pip wheel -r tests/requirements.txt
   - pip install tox
diff --git a/tox.ini b/tox.ini
index f4d0f6c..82f44fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,8 @@ deps =
     dj16: https://github.com/django/django/archive/stable/1.6.x.tar.gz#egg=django
     dj17: https://github.com/django/django/archive/stable/1.7.x.tar.gz#egg=django
     dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
-    dj19: https://github.com/django/django/archive/master.tar.gz#egg=django
+    dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
+    djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 
 commands =
     coverage run {envbindir}/django-cadmin test -v2 {posargs:tests}

From 58a7af013dda2e50f3c0b3d4bcee1f422ffcefa1 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 30 Sep 2015 01:17:35 +0200
Subject: [PATCH 2/2] fixup! Travis/tox: use dj19 tarball, add master; remove
 unsupported

---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 82f44fc..d6cb839 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,9 @@ envlist =
     flake8-py27,
     flake8-py33,
     py{26,py}-dj{14,15,16},
-    py27-dj{14,15,16,17,18,19},
-    py{32,33,34,py}-dj{15,16,17,18,19}
+    py27-dj{14,15,16,17,18,19,master},
+    py{32,33,34,py}-dj{15,16,17,18}
+    py{34,py}-dj{19,master}
 
 [testenv]
 basepython =