From 833bac5934eccd91b5b933087638fe8c2d33a921 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 16 Jun 2018 11:37:10 +0200
Subject: [PATCH] Broken test matrix

---
 .travis.yml | 51 ++++++++++++++++++++-------------------------------
 tox.ini     |  9 +++++++++
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f310727..37795c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,44 +8,33 @@ python:
   - "3.6"
 
 env:
-  - TOX_ENV=py36-django-111
-  - TOX_ENV=py35-django-111
-  - TOX_ENV=py27-django-111
-  - TOX_ENV=py36-django-20
-  - TOX_ENV=py35-django-20
-  - TOX_ENV=py36-django-master
-  - TOX_ENV=py35-django-master
+  - DJANGO=1.11
+  - DJANGO=2.0
+  - DJANGO=2.1
+  - DJANGO=master
 
 matrix:
   fast_finish: true
-  include:
-    - python: 3.6
-      env: TOX_ENV=py36-django-111
-    - python: 3.5
-      env: TOX_ENV=py35-django-111
-    - python: 2.7
-      env: TOX_ENV=py27-django-111
-    - python: 3.6
-      env: TOX_ENV=py36-django-20
-    - python: 3.5
-      env: TOX_ENV=py35-django-20
-    - python: 3.6
-      env: TOX_ENV=py36-django-master
-    - python: 3.5
-      env: TOX_ENV=py35-django-master
+  exclude:
+    - { python: "2.7", env: DJANGO=master }
+    - { python: "2.7", env: DJANGO=2.0 }
+    - { python: "2.7", env: DJANGO=2.1 }
+    - { python: "3.5", env: DJANGO=master }
+    - { python: "3.5", env: DJANGO=2.1 }
 
   allow_failures:
-    - env: TOX_ENV=py35-django-master
-    - env: TOX_ENV=py36-django-master
+    - env: DJANGO=master
+    - env: DJANGO=2.1
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-# install: pip install pytest-django
-
-# command to run tests using coverage, e.g. python setup.py test
-script: tox -e $TOX_ENV
+script:
+  - tox
 
 install:
-  - pip install tox codecov
+  - pip install tox tox-travis
 
 after_success:
-  - codecov -e TOX_ENV
+  - pip install codecov
+  - codecov -e TOXENV,DJANGO
+
+notifications:
+  email: false
diff --git a/tox.ini b/tox.ini
index 63b2384..72c8930 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,14 @@ envlist =
     {py35,py36}-django-master
 
 
+
+[travis:env]
+DJANGO =
+    1.11: django-111
+    2.0: django-20
+    2.1: django-21
+    master: django-master
+
 [testenv]
 
 setenv =
@@ -19,6 +27,7 @@ deps =
     django-{111,20,master}: djangorestframework>=3.7
     django-111: Django>=1.11,<2
     django-20: Django>=2.0,<2.1
+    django-21: Django>=2.1,<2.2
     django-master: https://github.com/django/django/archive/master.tar.gz
     -r{toxinidir}/requirements-test.txt