diff options
| author | mattip <matti.picus@gmail.com> | 2018-11-01 16:55:28 +0200 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2018-11-01 16:55:28 +0200 |
| commit | e6a31efdc81239fe59818b0ef95307a2452ca7a1 (patch) | |
| tree | 746e1e0834fc89ea69952e74cbc80e5652de055b | |
| parent | 621f477a73c5afe152ef393e4f1113dec57ce823 (diff) | |
| download | numpy-e6a31efdc81239fe59818b0ef95307a2452ca7a1.tar.gz | |
force python3 in chroot
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 9415c3845..29b04f296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ matrix: sudo: true # travis-ci/travis-ci#9069 env: INSTALL_PICKLE5=1 - python: 3.6 - env: USE_CHROOT=1 ARCH=i386 DIST=bionic PYTHON=python3 PIP=pip3 + env: USE_CHROOT=1 ARCH=i386 DIST=bionic sudo: true addons: apt: diff --git a/tools/travis-test.sh b/tools/travis-test.sh index 1549b8f05..3b56f1162 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 python3-dev python-pip python3-pip \ - cython python3-pytest python-pytest" + libatlas-base-dev gfortran python3-dev python3-pip \ + cython python3-pytest" } run_test() @@ -231,7 +231,7 @@ elif [ -n "$USE_CHROOT" ] && [ $# -eq 0 ]; then export LANG=C LC_ALL=C # 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=python3 PIP=pip3 IN_CHROOT=1 $0 test" else setup_base run_test |