From c6e58db73e95e479c5e0298ff3fab9726c422739 Mon Sep 17 00:00:00 2001
From: Charlie Denton <charlie@meshy.co.uk>
Date: Fri, 14 Apr 2017 01:03:11 +0100
Subject: [PATCH] Use tox for travis builds

This paves the way for more complex tox configs that don't need
duplicated config.
---
 .travis.yml | 154 ++++++++++++++++++++++++++--------------------------
 tox.ini     |   3 +-
 2 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be2fa59..9da22ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,97 +10,95 @@ python:
   - "3.5"
   - "3.6"
 env:
-  - DJANGO="Django>=1.4,<1.5"
-  - DJANGO="Django>=1.5,<1.6"
-  - DJANGO="Django>=1.6,<1.7"
-  - DJANGO="Django>=1.7,<1.8"
-  - DJANGO="Django>=1.8,<1.9"
-  - DJANGO="Django>=1.9,<1.10"
-  - DJANGO="Django>=1.10,<1.11"
-  - DJANGO="Django>=1.11,<1.12"
-  - DJANGO="https://github.com/django/django/tarball/master"
+  - TOX_ENV="django14"
+  - TOX_ENV="django15"
+  - TOX_ENV="django16"
+  - TOX_ENV="django17"
+  - TOX_ENV="django18"
+  - TOX_ENV="django19"
+  - TOX_ENV="django110"
+  - TOX_ENV="django111"
+  - TOX_ENV="djangodev"
 
 matrix:
   exclude:
-  - python: "3.6"
-    env: DJANGO="Django>=1.4,<1.5"
-  - python: "3.6"
-    env: DJANGO="Django>=1.5,<1.6"
-  - python: "3.6"
-    env: DJANGO="Django>=1.6,<1.7"
-  - python: "3.6"
-    env: DJANGO="Django>=1.7,<1.8"
-  - python: "3.6"
-    env: DJANGO="Django>=1.8,<1.9"
-  - python: "3.6"
-    env: DJANGO="Django>=1.9,<1.10"
-  - python: "3.6"
-    env: DJANGO="Django>=1.10,<1.11"
+    - python: "3.6"
+      env: TOX_ENV="django14"
+    - python: "3.6"
+      env: TOX_ENV="django15"
+    - python: "3.6"
+      env: TOX_ENV="django16"
+    - python: "3.6"
+      env: TOX_ENV="django17"
+    - python: "3.6"
+      env: TOX_ENV="django18"
+    - python: "3.6"
+      env: TOX_ENV="django19"
+    - python: "3.6"
+      env: TOX_ENV="django110"
 
-  - python: "3.5"
-    env: DJANGO="Django>=1.4,<1.5"
-  - python: "3.5"
-    env: DJANGO="Django>=1.5,<1.6"
-  - python: "3.5"
-    env: DJANGO="Django>=1.6,<1.7"
-  - python: "3.5"
-    env: DJANGO="Django>=1.7,<1.8"
+    - python: "3.5"
+      env: TOX_ENV="django14"
+    - python: "3.5"
+      env: TOX_ENV="django15"
+    - python: "3.5"
+      env: TOX_ENV="django16"
+    - python: "3.5"
+      env: TOX_ENV="django17"
 
-  - python: "3.4"
-    env: DJANGO="Django>=1.4,<1.5"
-  - python: "3.4"
-    env: DJANGO="Django>=1.9,<1.10"
-  - python: "3.4"
-    env: DJANGO="Django>=1.10,<1.11"
-  - python: "3.4"
-    env: DJANGO="Django>=1.11,<1.12"
+    - python: "3.4"
+      env: TOX_ENV="django14"
+    - python: "3.4"
+      env: TOX_ENV="django19"
+    - python: "3.4"
+      env: TOX_ENV="django110"
+    - python: "3.4"
+      env: TOX_ENV="django111"
 
-  - python: "3.3"
-    env: DJANGO="Django>=1.4,<1.5"
-  - python: "3.3"
-    env: DJANGO="Django>=1.9,<1.10"
-  - python: "3.3"
-    env: DJANGO="Django>=1.10,<1.11"
-  - python: "3.3"
-    env: DJANGO="Django>=1.11,<1.12"
-  - python: "3.3"
-    env: DJANGO="https://github.com/django/django/tarball/master"
+    - python: "3.3"
+      env: TOX_ENV="django14"
+    - python: "3.3"
+      env: TOX_ENV="django19"
+    - python: "3.3"
+      env: TOX_ENV="django110"
+    - python: "3.3"
+      env: TOX_ENV="django111"
+    - python: "3.3"
+      env: TOX_ENV="djangodev"
 
-  - python: "3.2"
-    env: DJANGO="Django>=1.4,<1.5"
-  - python: "3.2"
-    env: DJANGO="Django>=1.9,<1.10"
-  - python: "3.2"
-    env: DJANGO="Django>=1.10,<1.11"
-  - python: "3.2"
-    env: DJANGO="Django>=1.11,<1.12"
-  - python: "3.2"
-    env: DJANGO="https://github.com/django/django/tarball/master"
+    - python: "3.2"
+      env: TOX_ENV="django14"
+    - python: "3.2"
+      env: TOX_ENV="django19"
+    - python: "3.2"
+      env: TOX_ENV="django110"
+    - python: "3.2"
+      env: TOX_ENV="django111"
+    - python: "3.2"
+      env: TOX_ENV="djangodev"
+
+    - python: "2.6"
+      env: TOX_ENV="django17"
+    - python: "2.6"
+      env: TOX_ENV="django18"
+    - python: "2.6"
+      env: TOX_ENV="django19"
+    - python: "2.6"
+      env: TOX_ENV="django110"
+    - python: "2.6"
+      env: TOX_ENV="django111"
+    - python: "2.6"
+      env: TOX_ENV="djangodev"
 
-  - python: "2.6"
-    env: DJANGO="Django>=1.7,<1.8"
-  - python: "2.6"
-    env: DJANGO="Django>=1.8,<1.9"
-  - python: "2.6"
-    env: DJANGO="Django>=1.9,<1.10"
-  - python: "2.6"
-    env: DJANGO="Django>=1.10,<1.11"
-  - python: "2.6"
-    env: DJANGO="Django>=1.11,<1.12"
-  - python: "2.6"
-    env: DJANGO="https://github.com/django/django/tarball/master"
   allow_failures:
-    - env: DJANGO="Django>=1.11,<1.12"
-    - env: DJANGO="https://github.com/django/django/tarball/master"
+    - env: TOX_ENV="django111"
+    - env: TOX_ENV="djangodev"
 
 before_install:
-- pip install codecov
-
-install:
-  - pip install -q $DJANGO coverage==3.6
+- pip install codecov tox
 
 script:
-  - coverage run --source=polymorphic runtests.py
+  - tox -e py${TRAVIS_PYTHON_VERSION/./}-$TOX_ENV
 
 after_success:
 - codecov
diff --git a/tox.ini b/tox.ini
index 32508e2..cff1ea7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ envlist=
 
 [testenv]
 deps =
+    coverage == 3.6
     django14: Django >= 1.4, < 1.5
     django15: Django >= 1.5, < 1.6
     django16: Django >= 1.6, < 1.7
@@ -21,7 +22,7 @@ deps =
     django111: Django >= 1.11, < 1.12
     djangodev: https://github.com/django/django/tarball/master
 commands=
-    python runtests.py
+    coverage run --source polymorphic runtests.py
 
 [testenv:docs]
 deps=Sphinx