summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2015-04-27 16:01:17 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2015-05-03 16:07:29 +0200
commitd9eb7a5fce10a6bf1b15049536fbbd057f33f1fa (patch)
treecda7598c1c34a7617fb339f6fe8126aba647a3a2
parent588aff4847eaaec1b3192bf878dc515298b9fdcf (diff)
downloadnumpy-d9eb7a5fce10a6bf1b15049536fbbd057f33f1fa.tar.gz
TST: re-enable TravisCI testing with Bento.
Disabling was done in gh-5708, due to the Waf download site being down for a while.
-rw-r--r--.travis.yml5
-rwxr-xr-xtools/travis-test.sh2
2 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 0bf2ab447..b39d335ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,8 @@ matrix:
env: NPY_SEPARATE_COMPILATION=0 PYTHON_OO=1
- python: 3.4
env: NPY_RELAXED_STRIDES_CHECKING=0
-# disable bento test until waf issue is resolved.
-# - python: 2.7
-# env: USE_BENTO=1
+ - python: 2.7
+ env: USE_BENTO=1
- python: 2.7
env: USE_WHEEL=1
before_install:
diff --git a/tools/travis-test.sh b/tools/travis-test.sh
index 3981c3b58..26c07a75b 100755
--- a/tools/travis-test.sh
+++ b/tools/travis-test.sh
@@ -62,7 +62,7 @@ setup_bento()
cd ..
# Waf
- wget http://ftp.waf.io/pub/release/waf-1.7.16.tar.bz2
+ wget https://raw.githubusercontent.com/rgommers/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