Modernized Travis configuration to use tox-travis

asphalt-framework · Dec 6, 2015 · 31d262c · 31d262c
1 parent 81d9a11
commit 31d262c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,16 @@
+sudo: false
+
 language: python
-matrix:
-  include:
-    - python: 3.4
-      env: TOX_ENV=py34
-    - python: 3.5
-      env: TOX_ENV=py35
-    - python: 3.5
-      env: TOX_ENV=docs
-    - python: 3.5
-      env: TOX_ENV=flake8
-install:
-  - pip install tox coveralls
-script:
-  - tox -e $TOX_ENV
-after_success:
-  - coveralls
+
+python:
+  - "3.4"
+  - "3.5"
+
+install: pip install tox-travis
+
+script: tox
+
+after_success: coveralls
+
 notifications:
   irc: "chat.freenode.net#asphalt"
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,10 @@
 [tox]
 envlist = py34,py35,flake8
 
+[tox:travis]
+3.4 = py34
+3.5 = py35, flake8, docs
+
 [testenv]
 deps = pytest
     pytest-asyncio