travis: Use tox-travis

This simplifies our .travis.yml file

Signed-off-by: Stephen Finucane <stephen@that.guru>
Reviewed-by: Daniel Axtens <dja@axtens.net>

diff --git a/.travis.yml b/.travis.yml
index 6e5fe52831b88b6b681d495c9532f89fa283da61..80f5634d04bb02f1b9b4e77cccb978dfe6b15971 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: python
-python: 3.5
+
+python:
+  - 2.7
+  - 3.4
+  - 3.5
 
 services:
   - mysql
@@ -9,26 +13,12 @@ env:
     - PW_TEST_DB_USER=travis
     - PW_TEST_DB_PASS=""
     - PW_SKIP_BROWSER_TESTS=yes
-  matrix:
-    - TOX_ENV=py27-django16
-    - TOX_ENV=py27-django17
-    - TOX_ENV=py27-django18
-    - TOX_ENV=py27-django19
-    - TOX_ENV=py27-django110
-    - TOX_ENV=py34-django16
-    - TOX_ENV=py34-django17
-    - TOX_ENV=py34-django18
-    - TOX_ENV=py34-django19
-    - TOX_ENV=py34-django110
-    - TOX_ENV=py35-django18
-    - TOX_ENV=py35-django19
-    - TOX_ENV=py35-django110
 
 before_script:
   - mysql -e 'create database patchwork character set utf8;'
 
 install:
-  - pip install tox
+  - pip install tox-travis
 
 script:
-  - tox -e $TOX_ENV
+  - tox