diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-19 10:11:50 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-19 10:11:50 -0600 |
| commit | 0648d9f3b4894571968cac5439129331527835a8 (patch) | |
| tree | 011b8212e910ec6b3c2634ccc41603460bb0aa09 | |
| parent | 60788241061e047cadbbfc1af114d2e7ee7ff0ca (diff) | |
| download | numpy-0648d9f3b4894571968cac5439129331527835a8.tar.gz | |
MAINT,TST: Remove Bento from the travis ci testing.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 36 |
2 files changed, 1 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml index ff5cf98a0..5d5c149b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,6 @@ matrix: - python: 3.4 env: NPY_RELAXED_STRIDES_CHECKING=0 - python: 2.7 - env: USE_BENTO=1 - - python: 2.7 env: USE_WHEEL=1 before_install: - uname -a diff --git a/tools/travis-test.sh b/tools/travis-test.sh index 51b3b2c17..b888a7eb0 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -60,36 +60,6 @@ setup_chroot() sudo chroot $DIR bash -c "apt-get install -qq -y --force-yes libatlas-dev libatlas-base-dev gfortran python3-dev python3-nose python3-pip cython3 cython" } -setup_bento() -{ - export CI_ROOT=$PWD - cd .. - - # Waf - wget https://raw.githubusercontent.com/numpy/numpy-vendor/master/waf-1.7.16.tar.bz2 - tar xjvf waf-1.7.16.tar.bz2 - cd waf-1.7.16 - python waf-light - export WAFDIR=$PWD - cd .. - - # Bento - wget https://github.com/cournape/Bento/archive/master.zip - unzip master.zip - cd Bento-master - python bootstrap.py - export BENTO_ROOT=$PWD - cd .. - - cd $CI_ROOT - - # In-place numpy build - $BENTO_ROOT/bentomaker build -v -i -j - - # Prepend to PYTHONPATH so tests can be run - export PYTHONPATH=$PWD:$PYTHONPATH -} - run_test() { if [ -n "$USE_DEBUG" ]; then @@ -134,7 +104,7 @@ if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then $PIP install nose popd run_test -elif [ "$USE_CHROOT" != "1" ] && [ "$USE_BENTO" != "1" ]; then +elif [ "$USE_CHROOT" != "1" ]; then setup_base run_test elif [ -n "$USE_CHROOT" ] && [ $# -eq 0 ]; then @@ -142,10 +112,6 @@ elif [ -n "$USE_CHROOT" ] && [ $# -eq 0 ]; then setup_chroot $DIR # run again in chroot with this time testing sudo linux32 chroot $DIR bash -c "cd numpy && PYTHON=python3 PIP=pip3 IN_CHROOT=1 $0 test" -elif [ -n "$USE_BENTO" ] && [ $# -eq 0 ]; then - setup_bento - # run again this time testing - $0 test else run_test fi |