fixing travis

This commit is contained in:
Hans Dembinski 2016-07-16 13:56:20 -04:00
parent 28735e4748
commit af75ec6034

View File

@ -11,37 +11,37 @@ matrix:
packages:
- g++-4.8
- libboost1.55-all-dev
env: COMPILER=g++-4.8 PYTHON_VERSION=2 USE_PYTHON=ON USE_NUMPY=ON COVERAGE=ON
env: PYTHON_VERSION=2 USE_PYTHON=ON USE_NUMPY=ON COVERAGE=ON
- compiler: clang
addons:
apt:
sources:
- llvm-toolchain-precise-3.7
- llvm-toolchain-precise-3.6
- boost-latest
packages:
- clang-3.7
- clang-3.6
- libboost1.55-all-dev
env: COMPILER=clang++-3.7 PYTHON_VERSION=2 USE_PYTHON=ON USE_NUMPY=ON COVERAGE=OFF
env: PYTHON_VERSION=2 USE_PYTHON=ON USE_NUMPY=ON COVERAGE=OFF
- compiler: clang
addons:
apt:
sources:
- llvm-toolchain-precise-3.7
- llvm-toolchain-precise-3.6
- boost-latest
packages:
- clang-3.7
- clang-3.6
- libboost1.55-all-dev
env: COMPILER=clang++-3.7 PYTHON_VERSION=2 USE_PYTHON=ON USE_NUMPY=OFF COVERAGE=OFF
env: PYTHON_VERSION=2 USE_PYTHON=ON USE_NUMPY=OFF COVERAGE=OFF
- compiler: clang
addons:
apt:
sources:
- llvm-toolchain-precise-3.7
- llvm-toolchain-precise-3.6
- boost-latest
packages:
- clang-3.7
- clang-3.6
- libboost1.55-all-dev
env: COMPILER=clang++-3.7 PYTHON_VERSION=2 USE_PYTHON=OFF USE_NUMPY=OFF COVERAGE=OFF
env: PYTHON_VERSION=2 USE_PYTHON=OFF USE_NUMPY=OFF COVERAGE=OFF
git:
depth: 10
@ -55,7 +55,7 @@ before_install:
# Install packages
install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- if [ "$CXX" = "clang" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
- if [ "$CXX" = "clang" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
- conda create --name pyenv --yes python=${PYTHON_VERSION} numpy
- source activate pyenv
- pip install --user cpp-coveralls