From f8852c12818ede5b1b880e0756731846ec1134fa Mon Sep 17 00:00:00 2001
From: Jerome Leclanche <jerome@leclan.ch>
Date: Thu, 1 Jun 2017 11:39:22 +0300
Subject: [PATCH] Travis: Use Tox for test matrix

---
 .travis.yml | 61 ++++++++++++++++++++++++++++++++---------------------
 tox.ini     | 20 +++++++++---------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fbbe5f..c5cef80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,55 @@
+# https://travis-ci.org/django-polymorphic/django-polymorphic
 sudo: false
 language: python
-cache: pip
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
+
+python: "3.6"
+
 env:
-  - TOXENV="django110"
-  - TOXENV="django111"
-  - TOXENV="djangodev"
+  - TOXENV=py27-django110
+  - TOXENV=py27-django111
+  - TOXENV=py34-django110
+  - TOXENV=py34-django111
+  - TOXENV=py35-django110
+  - TOXENV=py35-django111
+  - TOXENV=py35-djangomaster
+  - TOXENV=py36-django111
+  - TOXENV=py36-djangomaster
 
 matrix:
   fast_finish: true
+  include:
+    - python: "3.5"
+      env: TOXENV=py35-django110
+    - python: "3.5"
+      env: TOXENV=py35-django111
+    - python: "3.5"
+      env: TOXENV=py35-djangomaster
   exclude:
     - python: "3.6"
-      env: TOXENV="django110"
-
-    - python: "3.4"
-      env: TOXENV="django110"
-    - python: "3.4"
-      env: TOXENV="django111"
-
-    - python: "2.7"
-      env: TOXENV="djangodev"
-
+      env: TOXENV=py35-django110
+    - python: "3.6"
+      env: TOXENV=py35-django111
+    - python: "3.6"
+      env: TOXENV=py35-djangomaster
   allow_failures:
-    - env: TOXENV="djangodev"
+    - env: TOXENV=py35-djangomaster
+    - env: TOXENV=py36-djangomaster
 
-before_install:
-- pip install codecov coverage==3.6 tox
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $TRAVIS_BUILD_DIR/.tox
+
+install:
+  - pip install --upgrade pip wheel setuptools
+  - pip install codecov coverage tox
 
 script:
   - tox
 
 after_success:
-- coverage xml -i
-- codecov
+  - coverage xml -i
+  - codecov
 
 branches:
   only:
diff --git a/tox.ini b/tox.ini
index 1346b29..9d24cfa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,21 @@
 [tox]
 envlist =
-    py27-django{110,111}
-    py34-django{110,111}
-    py35-django{110,111,dev}
-    py36-django{111,dev}
-    docs
+	py27-django{110,111}
+	py34-django{110,111}
+	py35-django{110,111,master}
+	py36-django{111,master}
+	docs
 
 [testenv]
 setenv =
 	PYTHONWARNINGS = all
 deps =
-    coverage == 3.6
-    django110: Django >= 1.10, < 1.11
-    django111: Django >= 1.11, < 1.12
-    djangodev: https://github.com/django/django/tarball/master
+	coverage
+	django110: Django >= 1.10, < 1.11
+	django111: Django >= 1.11, < 2.0
+	djangomaster: https://github.com/django/django/archive/master.tar.gz
 commands =
-    coverage run --source polymorphic runtests.py
+	coverage run --source polymorphic runtests.py
 
 [testenv:docs]
 deps =