diff options
| -rw-r--r-- | .travis.yml | 22 | ||||
| -rwxr-xr-x | tools/travis-before-install.sh | 31 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 7 |
3 files changed, 34 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index 58fc8415e..5f5bf9757 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,27 +71,7 @@ matrix: - PYTHONOPTIMIZE=2 - USE_ASV=1 before_install: - - uname -a - - free -m - - df -h - - ulimit -a - - mkdir builds - - pushd builds - # Build into own virtualenv - # We therefore control our own environment, avoid travis' numpy - # - # Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have - # pinned `virtualenv` to the last known working version to avoid this failure. - # Appears we had some issues with certificates on Travis. It looks like - # bumping to 14.0.6 will help. - - pip install -U 'virtualenv==14.0.6' - - virtualenv --python=python venv - - source venv/bin/activate - - python -V - - pip install --upgrade pip setuptools - - pip install nose pytz cython - - if [ -n "$USE_ASV" ]; then pip install asv; fi - - popd + - ./tools/travis-before-install.sh script: - ./tools/travis-test.sh diff --git a/tools/travis-before-install.sh b/tools/travis-before-install.sh new file mode 100755 index 000000000..5e5278ce5 --- /dev/null +++ b/tools/travis-before-install.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +uname -a +free -m +df -h +ulimit -a +mkdir builds +pushd builds + +# Build into own virtualenv +# We therefore control our own environment, avoid travis' numpy +# +# Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have +# pinned `virtualenv` to the last known working version to avoid this failure. +# Appears we had some issues with certificates on Travis. It looks like +# bumping to 14.0.6 will help. +pip install -U 'virtualenv==14.0.6' + +if [ -n "$USE_DEBUG" ] +then + virtualenv --python=python3-dbg venv +else + virtualenv --python=python venv +fi + +source venv/bin/activate +python -V +pip install --upgrade pip setuptools +pip install nose pytz cython +if [ -n "$USE_ASV" ]; then pip install asv; fi +popd diff --git a/tools/travis-test.sh b/tools/travis-test.sh index be841c8fa..2eef17d41 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -11,15 +11,12 @@ if [ -r /usr/lib/libeatmydata/libeatmydata.so ]; then export LD_PRELOAD=/usr/lib/libeatmydata/libeatmydata.so fi +source builds/venv/bin/activate + # travis venv tests override python PYTHON=${PYTHON:-python} PIP=${PIP:-pip} -# explicit python version needed here -if [ -n "$USE_DEBUG" ]; then - PYTHON="python3-dbg" -fi - if [ -n "$PYTHON_OO" ]; then PYTHON="${PYTHON} -OO" fi |