Simplified travis ci config. (#189)

* Simplified travis ci config. * Fixed toxenvs for mac. Brew has python 3.6, added that to the build matrix. * Removed .travis/install.sh
circuits · Jan 15, 2017 · 9a07284 · 9a07284
1 parent f1abe5d
commit 9a07284
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 43 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,42 +2,40 @@ sudo: false
 
 language: python
 
+python:
+  - 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
+  - pypy
+
 matrix:
   include:
-    - os: linux
-      python: 2.6
-      env: TOXENV=py26
-    - os: linux
-      python: 2.7
-      env: TOXENV=py27
-    - os: linux
-      python: 3.3
-      env: TOXENV=py33
-    - os: linux
-      python: 3.4
-      env: TOXENV=py34
-    - os: linux
-      python: 3.5
-      env: TOXENV=py35
-    - os: linux
-      python: pypy
-      env: TOXENV=pypy
-    - os: osx
+    - python: 2.7
+      os: osx
       language: generic
       env: TOXENV=py27
-    - os: osx
+    - python: 3.6
+      os: osx
       language: generic
-      env: TOXENV=py35
-    - os: osx
+      env: TOXENV=py36
+      before_install: brew install python3
+    - python: pypy
+      os: osx
       language: generic
       env: TOXENV=pypy
-before_install:
-  - ./.travis/install.sh
+      before_install: brew install pypy
+
 install:
+  - pip install tox-travis
   - pip install -Ur requirements-test.txt
   - pip install -Ue .
-script: python setup.py test
-after_success:
-  - coveralls
+
+script: tox
+
+after_success: coveralls
+
 notifications:
   irc: "chat.freenode.net#circuits"
diff --git a/.travis/install.sh b/.travis/install.sh
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = docs,py26,py27,py32,py33,py34,py35,pypy
+envlist = docs,py26,py27,py32,py33,py34,py35,py36,pypy
 skip_missing_interpreters = True
 
 [testenv]