Skip to content

Commit

Permalink
Switch Py2.7 --> 3.6 in order of travis tests and for code coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
jobovy committed Apr 19, 2018
1 parent 1710462 commit 49c7ca4
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sudo: false
language: python
python:
- "2.7"
- "3.6"
- "2.7"
env: #split tests
global:
- REQUIRES_PYNBODY=false
Expand Down Expand Up @@ -34,16 +34,16 @@ before_install:
- export PATH=$HOME/usr/bin:$PATH
- make -C lcov-1.11/ install PREFIX=$HOME
# Install GSLv2
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then wget ftp://ftp.gnu.org/gnu/gsl/gsl-2.2.tar.gz; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then tar xf gsl-2.2.tar.gz; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then cd gsl-2.2; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then ./configure --prefix=$HOME/usr; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then make; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then make install; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then cd -; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then export CFLAGS=-I$HOME/usr/include; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then export LDFLAGS=-L$HOME/usr/lib; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then export LD_LIBRARY_PATH=$HOME/usr/lib; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then wget ftp://ftp.gnu.org/gnu/gsl/gsl-2.2.tar.gz; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then tar xf gsl-2.2.tar.gz; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then cd gsl-2.2; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then ./configure --prefix=$HOME/usr; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then make; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then make install; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then cd -; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then export CFLAGS=-I$HOME/usr/include; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then export LDFLAGS=-L$HOME/usr/lib; fi
- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then export LD_LIBRARY_PATH=$HOME/usr/lib; fi
#Setup conda for faster installs
- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
Expand Down Expand Up @@ -83,10 +83,10 @@ script:
- if [[ $TEST_FILES == 'tests/test_orbit.py' ]]; then travis_wait 40 pytest -v $TEST_FILES --cov galpy --cov-config .coveragerc_travis --disable-pytest-warnings; else pytest -v $TEST_FILES --cov galpy --cov-config .coveragerc_travis --disable-pytest-warnings; fi
after_success:
# Generate lcov output
- lcov --capture --base-directory . --directory build/temp.linux-x86_64-2.7/galpy/ --no-external --output-file coverage_full.info
- lcov --capture --base-directory . --directory build/temp.linux-x86_64-3.6/galpy/ --no-external --output-file coverage_full.info
- lcov --remove coverage_full.info 'galpy/actionAngle_src/actionAngleTorus_c_ext/torus/*' -o coverage.info
# Codecov
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then bash <(curl -s https://codecov.io/bash) -X gcov; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then bash <(curl -s https://codecov.io/bash) -X gcov; fi
# coveralls: combine, generate json, and upload
- coveralls-lcov -v -n coverage.info > coverage.c.json
- coveralls-merge coverage.c.json
Expand Down

0 comments on commit 49c7ca4

Please sign in to comment.