diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 0a9a118b73..2e7b1c64fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ #============================================================================= # Project settings #============================================================================= -language: python - # Only build master and develop on push; do not build every branch. branches: only: @@ -13,29 +11,27 @@ branches: #============================================================================= # Build matrix #============================================================================= -python: - - 2.6 - - 2.7 - -env: - - TEST_SUITE=unit - - TEST_SUITE=flake8 - - TEST_SUITE=doc - matrix: - # Flake8 and Sphinx no longer support Python 2.6, and one run is enough. - exclude: - - python: 2.6 - env: TEST_SUITE=flake8 - - python: 2.6 - env: TEST_SUITE=doc - # Explicitly include an OS X build with homebrew's python. - # Works around Python issues on Travis for OSX, described here: - # http://blog.fizyk.net.pl/blog/running-python-tests-on-traviss-osx-workers.html include: - - os: osx - language: generic - env: TEST_SUITE=unit + - python: '2.6' + os: linux + language: python + env: TEST_SUITE=unit + - python: '2.7' + os: linux + language: python + env: TEST_SUITE=unit + - python: '2.7' + os: linux + language: python + env: TEST_SUITE=flake8 + - python: '2.7' + os: linux + language: python + env: TEST_SUITE=doc + - os: osx + language: generic + env: [ TEST_SUITE=unit, PYTHON_VERSION=2.7 ] #============================================================================= # Environment @@ -61,7 +57,7 @@ before_install: # Install various dependencies install: - - pip install --upgrade coveralls + - pip install --upgrade codecov - pip install --upgrade flake8 - pip install --upgrade sphinx - pip install --upgrade mercurial @@ -80,7 +76,7 @@ before_script: script: share/spack/qa/run-$TEST_SUITE-tests after_success: - - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 && $TRAVIS_OS_NAME == "linux" ]]; then coveralls; fi + - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 && $TRAVIS_OS_NAME == "linux" ]]; then codecov --env PY_VERSION; fi #============================================================================= # Notifications |