Merge c290e6e into 1ac80b5

.travis.yml

@@ -1,21 +1,20 @@
 sudo: false
+
 language: python
+
 matrix:
   include:
     - os: linux
-      python: "2.7"
+      python: 2.7
+      env: TOXENV=py27
     - os: osx
-      python: "2.7"
+      language: generic
+      env: TOXENV=py27
 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

.travis/install.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+  case "${TOXENV}" in
+    py27)
+      brew install python
+      ;;
+  esac
+fi

requirements-test.txt

@@ -0,0 +1,3 @@
+pytest
+coveralls
+pytest-cov