Use tox-travis

- Enable Python 3.3 and 3.4 in Travis - Run flake8 only on Python 2.7
hastexo · Jan 11, 2016 · bb6c8a5 · bb6c8a5
1 parent ae1936c
commit bb6c8a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,28 +3,16 @@ sudo: false
 
 language: python
 
-env:
-  # Generated with https://www.dominicrodger.com/tox-and-travis.html
-  - TOX_ENV=flake8
-  - TOX_ENV=py27-django17-oscar10
-  - TOX_ENV=py27-django17-oscar11
-  - TOX_ENV=py27-django18-oscar10
-  - TOX_ENV=py27-django18-oscar11
-  - TOX_ENV=py33-django17-oscar10
-  - TOX_ENV=py33-django17-oscar11
-  - TOX_ENV=py33-django18-oscar10
-  - TOX_ENV=py33-django18-oscar11
-  - TOX_ENV=py34-django17-oscar10
-  - TOX_ENV=py34-django17-oscar11
-  - TOX_ENV=py34-django18-oscar10
-  - TOX_ENV=py34-django18-oscar11
-
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
 
 install:
-    - pip install tox
+    - pip install tox-travis
 
 script:
-    - tox -e $TOX_ENV
+    - tox
 
 notifications:
   email: true
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,11 @@
 [tox]
 envlist = py{27,33,34}-django{17,18}-oscar{10,11},flake8
 
+[tox:travis]
+2.7 = flake8, py27
+3.3 = py33
+3.4 = py34
+
 [testenv]
 commands = python runtests.py []
 deps =