diff options
| author | mattip <matti.picus@gmail.com> | 2018-10-31 11:48:28 +0200 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2018-10-31 11:52:03 +0200 |
| commit | 621f477a73c5afe152ef393e4f1113dec57ce823 (patch) | |
| tree | 4621ba90bef93649892f1837b1b02a47794a5998 /tools | |
| parent | 7a0950649db5b83a881d8fb2bf8f95fdd885e081 (diff) | |
| download | numpy-621f477a73c5afe152ef393e4f1113dec57ce823.tar.gz | |
BUILD: use system python3 in the chroot
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/travis-test.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/travis-test.sh b/tools/travis-test.sh index 2a16b37a3..1549b8f05 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -101,8 +101,8 @@ setup_chroot() # install needed packages sudo chroot $DIR bash -c "apt-get install -qq -y \ - libatlas-base-dev gfortran python-dev python-nose python-pip cython \ - python-pytest" + libatlas-base-dev gfortran python-dev python3-dev python-pip python3-pip \ + cython python3-pytest python-pytest" } run_test() @@ -112,7 +112,7 @@ run_test() fi if [ -n "$RUN_COVERAGE" ]; then - pip install pytest-cov + $PIP install pytest-cov COVERAGE_FLAG=--coverage fi @@ -191,11 +191,11 @@ if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then . venv-for-wheel/bin/activate # Move out of source directory to avoid finding local numpy pushd dist - pip install --pre --no-index --upgrade --find-links=. numpy - pip install nose pytest + $PIP install --pre --no-index --upgrade --find-links=. numpy + $PIP install nose pytest if [ -n "$INSTALL_PICKLE5" ]; then - pip install pickle5 + $PIP install pickle5 fi popd @@ -215,10 +215,10 @@ elif [ -n "$USE_SDIST" ] && [ $# -eq 0 ]; then . venv-for-wheel/bin/activate # Move out of source directory to avoid finding local numpy pushd dist - pip install numpy* - pip install nose pytest + $PIP install numpy* + $PIP install nose pytest if [ -n "$INSTALL_PICKLE5" ]; then - pip install pickle5 + $PIP install pickle5 fi popd @@ -229,9 +229,9 @@ elif [ -n "$USE_CHROOT" ] && [ $# -eq 0 ]; then # the chroot'ed environment will not have the current locale, # avoid any warnings which may disturb testing export LANG=C LC_ALL=C - # run again in chroot with this time testing + # run again in chroot with this time testing with python3 sudo linux32 chroot $DIR bash -c \ - "cd numpy && PYTHON=python PIP=pip IN_CHROOT=1 $0 test" + "cd numpy && PYTHON=$PYTHON PIP=$PIP IN_CHROOT=1 $0 test" else setup_base run_test |