From f9d180b92cef86f4dd39a021634e11f958a64b49 Mon Sep 17 00:00:00 2001
From: Ryan P Kilby <rpkilby@ncsu.edu>
Date: Thu, 12 Jan 2017 15:25:14 -0500
Subject: [PATCH] Use tox-travis to sync python/env factors

---
 .travis.yml | 46 ++++++++++++++++++++++++----------------------
 tox.ini     | 20 ++++++++++++++------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f689f244e..40ea08672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,40 +2,42 @@ language: python
 
 python:
     - "2.7"
+    - "3.3"
+    - "3.4"
+    - "3.5"
 
 sudo: false
 
 env:
-    - TOX_ENV=py27-lint
-    - TOX_ENV=py27-docs
-    - TOX_ENV=py35-django19
-    - TOX_ENV=py34-django19
-    - TOX_ENV=py27-django19
-    - TOX_ENV=py35-django18
-    - TOX_ENV=py34-django18
-    - TOX_ENV=py33-django18
-    - TOX_ENV=py27-django18
-    - TOX_ENV=py27-django110
-    - TOX_ENV=py35-django110
-    - TOX_ENV=py34-django110
-    - TOX_ENV=py27-djangomaster
-    - TOX_ENV=py34-djangomaster
-    - TOX_ENV=py35-djangomaster
-    - TOX_ENV=py36-djangomaster
+    - DJANGO=1.8
+    - DJANGO=1.9
+    - DJANGO=1.10
+    - DJANGO=master
 
 matrix:
     fast_finish: true
+    include:
+      - python: "3.6"
+        env: DJANGO=master
+      - python: "2.7"
+        env: TOXENV="lint"
+      - python: "2.7"
+        env: TOXENV="docs"
+    exclude:
+      - python: "3.3"
+        env: DJANGO=1.9
+      - python: "3.3"
+        env: DJANGO=1.10
+      - python: "3.3"
+        env: DJANGO=master
     allow_failures:
-      - env: TOX_ENV=py27-djangomaster
-      - env: TOX_ENV=py34-djangomaster
-      - env: TOX_ENV=py35-djangomaster
-      - env: TOX_ENV=py36-djangomaster
+      - env: DJANGO=master
 
 install:
-    - pip install tox virtualenv
+    - pip install tox tox-travis
 
 script:
-    - tox -e $TOX_ENV
+    - tox
 
 after_success:
     - pip install codecov
diff --git a/tox.ini b/tox.ini
index d97ba7d05..e2813f269 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,11 +3,17 @@ addopts=--tb=short
 
 [tox]
 envlist =
-       py27-{lint,docs},
        {py27,py33,py34,py35}-django18,
-       {py27,py34,py35}-django19,
-       {py27,py34,py35}-django110,
-       {py27,py34,py35,py36}-django{master}
+       {py27,py34,py35}-django{19,110},
+       {py27,py34,py35,py36}-djangomaster,
+       lint,docs
+
+[travis:env]
+DJANGO =
+    1.8: django18
+    1.9: django19
+    1.10: django110
+    master: djangomaster
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
@@ -22,13 +28,15 @@ deps =
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt
 
-[testenv:py27-lint]
+[testenv:lint]
+basepython = python2.7
 commands = ./runtests.py --lintonly
 deps =
         -rrequirements/requirements-codestyle.txt
         -rrequirements/requirements-testing.txt
 
-[testenv:py27-docs]
+[testenv:docs]
+basepython = python2.7
 commands = mkdocs build
 deps =
        -rrequirements/requirements-testing.txt