From b5e1eb6adef0901228ed61a24c82553d3caf7bfd Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 29 Sep 2015 22:48:10 +0200
Subject: [PATCH] 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+.
 - Only test main Python 2 and 3 with Django master.
---
 .travis.yml | 13 +++++++++++--
 tox.ini     |  7 ++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e4c8904..7c0c0fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+python: 3.5
 sudo: false
 cache:
   directories:
@@ -22,26 +23,34 @@ 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=py35-dj18
+    - TOXENV=py35-dj19
+    - TOXENV=py35-djmaster
     - TOXENV=pypy-dj15
     - TOXENV=pypy-dj16
     - TOXENV=pypy-dj17
     - TOXENV=pypy-dj18
     - TOXENV=pypy-dj19
+matrix:
+  allow_failures:
+    - env: TOXENV=py27-djmaster
+    - env: TOXENV=py34-djmaster
+    - env: TOXENV=py35-djmaster
+    - env: TOXENV=pypy-djmaster
 install:
 - pip wheel -r tests/requirements.txt
 - pip install tox
diff --git a/tox.ini b/tox.ini
index 24723c1..e2c2e3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,9 @@ envlist =
     flake8-py27,
     flake8-py35,
     py{26,py}-dj{14,15,16},
-    py27-dj{14,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,35,py]-dj{19,master}}
+    py{34,35,py}-dj{19,master}
 
 [testenv]
 basepython =
@@ -30,7 +30,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}