diff --git a/.travis.yml b/.travis.yml index 3bc2c4a6..ff92644c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,6 @@ matrix: dist: trusty python: "2.7" - os: osx - env: FORMULA="python" - language: generic - - os: osx - env: FORMULA="python3" language: generic services: - docker @@ -29,8 +25,9 @@ addons: - python3-commandnotfound before_install: - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update ; fi - - if [[ $TRAVIS_OS_NAME == "osx" ]]; then if brew ls --versions $FORMULA; then brew upgrade $FORMULA || echo Python is up to date; else brew install $FORMULA; fi; fi - - if [[ $TRAVIS_OS_NAME == "osx" ]]; then virtualenv venv -p $FORMULA; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew upgrade python; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then pip3 install virtualenv; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then virtualenv venv -p python3; fi - if [[ $TRAVIS_OS_NAME == "osx" ]]; then source venv/bin/activate; fi - pip install -U pip - pip install -U coveralls