Fixes Travis CI builds (#167)

circuits · Jun 20, 2016 · 4feb252 · 4feb252
1 parent 1ac80b5
commit 4feb252
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,41 @@
 sudo: false
+
 language: python
+
 matrix:
   include:
     - os: linux
-      python: "2.7"
+      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
+      language: generic
+      env: TOXENV=py27
+    - os: osx
+      language: generic
+      env: TOXENV=py35
     - os: osx
-      python: "2.7"
+      language: generic
+      env: TOXENV=pypy
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update           ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pypy     ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python   ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3  ; fi
+  - ./.travis/install.sh
 install:
-  - pip install pytest
-  - pip install coveralls
-  - pip install pytest-cov
-  - python setup.py install
+  - pip install -r requirements-test.txt
+  - pip install -e .
 script: python setup.py test
 after_success:
   - coveralls

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+  case "${TOXENV}" in
+    py27)
+      brew install python
+    ;;
+    py35)
+      brew install python3
+    ;;
+    pypy)
+      brew install pypy
+    ;;
+  esac
+fi
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest
+coveralls
+pytest-cov