Skip to content

Commit 5dab817

Browse files
committed
do not build own python for testing
1 parent 0057b0a commit 5dab817

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

.travis.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ matrix:
1919

2020
# 1/ Linux Clang Builds
2121
- os: linux
22+
dist: xenial
2223
compiler: clang
2324
addons: &clang37
2425
apt:
@@ -27,12 +28,14 @@ matrix:
2728
env: CXX='clang++-3.7' CC='clang-3.7' FC='gfortran' BUILD_TYPE='release'
2829

2930
- os: linux
31+
dist: xenial
3032
compiler: clang
3133
addons: *clang37
3234
env: CXX='clang++-3.7' CC='clang-3.7' FC='gfortran' BUILD_TYPE='debug'
3335

3436
# 2/ Linux GCC Builds
3537
- os: linux
38+
dist: xenial
3639
compiler: gcc
3740
addons: &gcc5
3841
apt:
@@ -41,6 +44,7 @@ matrix:
4144
env: CXX='g++-5' CC='gcc-5' FC='gfortran-5' BUILD_TYPE='release'
4245

4346
- os: linux
47+
dist: xenial
4448
compiler: gcc
4549
addons: *gcc5
4650
env: CXX='g++-5' CC='gcc-5' FC='gfortran-5' BUILD_TYPE='debug'
@@ -68,24 +72,12 @@ matrix:
6872
env: CXX='g++' CC='gcc' FC='gfortran' BUILD_TYPE='release'
6973

7074
install:
71-
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
72-
- mkdir -p ${DEPS_DIR}
73-
- cd ${DEPS_DIR}
7475
- |
7576
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
7677
cd ${TRAVIS_BUILD_DIR}
7778
curl https://cmake.org/files/v3.12/cmake-3.12.3-Linux-x86_64.tar.gz | tar xz
7879
export PATH=$PWD/cmake-3.12.3-Linux-x86_64/bin:$PATH
7980
export LD_LIBARY_PATH=$PWD/cmake-3.12.3-Linux-x86_64/lib:$LD_LIBRARY_PATH
80-
cd ${DEPS_DIR}
81-
curl -O https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tgz
82-
tar xf Python-3.6.6.tgz
83-
cd Python-3.6.6
84-
./configure --prefix=${DEPS_DIR}/python/
85-
make > /dev/null
86-
make install > /dev/null
87-
export PATH=${DEPS_DIR}/python/bin:$PATH
88-
export LD_LIBARY_PATH=${DEPS_DIR}/python/lib:$LD_LIBRARY_PATH
8981
pip install --user pipenv --upgrade
9082
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
9183
brew update &> /dev/null
@@ -99,8 +91,10 @@ before_script:
9991
- cd ${TRAVIS_BUILD_DIR}
10092
- |
10193
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
94+
curl https://bootstrap.pypa.io/get-pip.py | python3
10295
pipenv install --python=python3
10396
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
97+
curl https://bootstrap.pypa.io/get-pip.py | /usr/local/bin/python3
10498
pipenv install --python=/usr/local/bin/python3
10599
fi
106100
- export PATH=$HOME/.local/bin:$PATH
@@ -124,7 +118,7 @@ script:
124118
- cd test_python_interface
125119
- |
126120
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
127-
pipenv install ${TRAVIS_BUILD_DIR}
121+
pipenv install --python=python3 ${TRAVIS_BUILD_DIR}
128122
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
129123
pipenv install --python=/usr/local/bin/python3 ${TRAVIS_BUILD_DIR}
130124
pipenv install --python=/usr/local/bin/python3 pytest

0 commit comments

Comments
 (0)