diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-05-03 10:40:52 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-05-03 10:40:52 -0400 |
| commit | 5e98be62a8b865c0b0abe894a37518aa67181c46 (patch) | |
| tree | 490d99ac5fb48497dbfa1c2dd85c4ae44ca1ebe8 | |
| parent | 3782f7e0bfd9ac230b672a1295df580a40e9e109 (diff) | |
| parent | d9eb7a5fce10a6bf1b15049536fbbd057f33f1fa (diff) | |
| download | numpy-5e98be62a8b865c0b0abe894a37518aa67181c46.tar.gz | |
Merge pull request #5829 from rgommers/bento-ci
TST: re-enable TravisCI testing with Bento.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index dbfe426b8..017cf862c 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 f31f1dc56..3e641b1f0 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 |