Merge pull request numpy#5829 from rgommers/bento-ci

TST: re-enable TravisCI testing with Bento.
miclark · May 3, 2015 · 5e98be6 · 5e98be6
2 parents 3782f7e + d9eb7a5
commit 5e98be6
Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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