From ccaa08d12efb27a52e97e661be29cc44c6c2740f Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 10 Jan 2018 10:44:25 +0100
Subject: [PATCH] Simplified tox setup with tox-travis.

---
 .travis.yml | 67 +++++++----------------------------------------------
 tox.ini     | 12 ++++++----
 2 files changed, 16 insertions(+), 63 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb7ce1d..92538f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,60 +1,11 @@
-language: python
 sudo: false
-
-matrix:
-  fast_finish: true
-  include:
-    - python: 2.7
-      env: TOXENV=py27-django18
-    - python: 2.7
-      env: TOXENV=py27-django19
-    - python: 2.7
-      env: TOXENV=py27-django110
-    - python: 2.7
-      env: TOXENV=py27-django111
-    - python: 3.4
-      env: TOXENV=py34-django18
-    - python: 3.4
-      env: TOXENV=py34-django19
-    - python: 3.4
-      env: TOXENV=py34-django110
-    - python: 3.4
-      env: TOXENV=py34-django111
-    - python: 3.4
-      env: TOXENV=py34-django200
-    - python: 3.5
-      env: TOXENV=py35-django18
-    - python: 3.5
-      env: TOXENV=py35-django19
-    - python: 3.5
-      env: TOXENV=py35-django110
-    - python: 3.5
-      env: TOXENV=py35-django111
-    - python: 3.5
-      env: TOXENV=py35-django200
-    - python: 3.5
-      env: TOXENV=py35-djangotrunk
-    - python: 3.6
-      env: TOXENV=py36-django111
-    - python: 3.6
-      env: TOXENV=py36-django200
-    - python: 3.6
-      env: TOXENV=py36-djangotrunk
-  allow_failures:
-    - python: 3.5
-      env: TOXENV=py35-djangotrunk
-    - python: 3.6
-      env: TOXENV=py36-django111
-    - python: 3.6
-      env: TOXENV=py36-djangotrunk
-
-install:
-  - pip install --upgrade pip setuptools tox virtualenv codecov
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PYVER=py36; fi
-
-script: tox -e$TOXENV -- --cov  # positional args ({posargs}) to pass into tox.ini
-
+language: python
+cache: pip
+python:
+- 2.7
+- 3.4
+- 3.5
+- 3.6
+install: pip install tox-travis codecov
+script: tox -- --cov  # positional args ({posargs}) to pass into tox.ini
 after_success: codecov
diff --git a/tox.ini b/tox.ini
index 83fa7b2..fe42bb1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
-    py27-django{18,19,110,111},
-    py34-django{18,19,110,111,200},
-    py35-django{18,19,110,111,200,trunk},
-    py36-django{111,200,trunk},
+    py27-django{18,19,110,111}
+    py34-django{18,19,110,111,200}
+    py35-django{18,19,110,111,200,trunk}
+    py36-django{111,200,trunk}
 
 [testenv]
 deps =
@@ -12,10 +12,12 @@ deps =
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
     django200: Django>=2.0,<2.1
-    djangotrunk: https://github.com/django/django/tarball/master
+    djangotrunk: https://github.com/django/django/archive/master.tar.gz
     freezegun == 0.3.8
     -rrequirements-test.txt
     pytest-cov
+ignore_outcome =
+    djangotrunk: True
 
 commands =
     pip install -e .