Skip to content

Commit 33f38c7

Browse files
committed
TST: add testing against pre-release numpy/scipy
Add travis test run using per-commit numpy development wheel, to make sure numpy master isn't breaking anything for us.
1 parent f9614fe commit 33f38c7

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

.travis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ sudo: false
1212
cache:
1313
directories:
1414
- $HOME/.cache/pip
15-
1615
addons:
1716
apt:
1817
packages:
1918
- libhdf5-serial-dev
20-
19+
# For numpy --pre wheels
20+
- libatlas-base-dev
2121
env:
2222
global:
2323
- DEPENDS="numpy scipy matplotlib h5py"
@@ -45,6 +45,10 @@ matrix:
4545
- python: 2.7
4646
env:
4747
- PYDICOM="v1.0"
48+
# test against pre-release builds
49+
- python: 2.7
50+
env:
51+
- EXTRA_PIP_FLAGS="--pre"
4852
# Documentation doctests
4953
- python: 2.7
5054
env:
@@ -71,7 +75,7 @@ before_install:
7175
- python --version # just to check
7276
- pip install -U pip wheel # upgrade to latest pip find 3.5 wheels; wheel to avoid errors
7377
- retry pip install nose flake8 # always
74-
- wheelhouse_pip_install $DEPENDS
78+
- wheelhouse_pip_install $EXTRA_PIP_FLAGS $DEPENDS
7579
# pydicom <= 0.9.8 doesn't install on python 3
7680
- if [ "${TRAVIS_PYTHON_VERSION:0:1}" == "2" ]; then
7781
if [ "$PYDICOM" == "1" ]; then
@@ -92,13 +96,13 @@ install:
9296
elif [ "$INSTALL_TYPE" == "sdist" ]; then
9397
python setup_egg.py egg_info # check egg_info while we're here
9498
python setup_egg.py sdist
95-
wheelhouse_pip_install dist/*.tar.gz
99+
wheelhouse_pip_install $EXTRA_PIP_FLAGS dist/*.tar.gz
96100
elif [ "$INSTALL_TYPE" == "wheel" ]; then
97101
pip install wheel
98102
python setup_egg.py bdist_wheel
99-
wheelhouse_pip_install dist/*.whl
103+
wheelhouse_pip_install $EXTRA_PIP_FLAGS dist/*.whl
100104
elif [ "$INSTALL_TYPE" == "requirements" ]; then
101-
wheelhouse_pip_install -r requirements.txt
105+
wheelhouse_pip_install $EXTRA_PIP_FLAGS -r requirements.txt
102106
python setup.py install
103107
fi
104108
# Point to nibabel data directory

tools/travis_tools.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Tools for working with travis-ci
2-
export WHEELHOST="travis-wheels.scikit-image.org"
3-
export WHEELHOUSE="http://${WHEELHOST}/"
2+
WHEELHOSTS="travis-wheels.scikit-image.org travis-dev-wheels.scipy.org"
3+
4+
PIP_FLAGS="--timeout=60 --no-index"
5+
6+
for host in $WHEELHOSTS; do
7+
PIP_FLAGS="${PIP_FLAGS} --trusted-host ${host} --find-links=http://${host}"
8+
done
9+
410

511
retry () {
612
# https://gist.github.com/fungusakafungus/1026804
@@ -22,5 +28,5 @@ retry () {
2228

2329
wheelhouse_pip_install() {
2430
# Install pip requirements via travis wheelhouse
25-
retry pip install --timeout=60 --no-index --trusted-host $WHEELHOST --find-links $WHEELHOUSE $@
31+
retry pip install $PIP_FLAGS $@
2632
}

0 commit comments

Comments
 (0)