Skip to content

Commit f0dcb5c

Browse files
committed
BLD: add numpy 1.8.x builds as optional
1 parent 0a0224c commit f0dcb5c

4 files changed

+22
-7
lines changed

.travis.yml

+18-6
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,28 @@ matrix:
4848
- python: 2.7
4949
env:
5050
- NOSE_ARGS="not slow and not network and not disabled"
51-
- JOB_NAME: "27_numpy_dev"
52-
- JOB_TAG=_NUMPY_DEV
53-
- NUMPY_BUILD=true # build numpy master from source
51+
- JOB_NAME: "27_numpy_master"
52+
- JOB_TAG=_NUMPY_DEV_master
53+
- NUMPY_BUILD=master
54+
- python: 2.7
55+
env:
56+
- NOSE_ARGS="not slow and not network and not disabled"
57+
- JOB_NAME: "27_numpy_1.8.x"
58+
- JOB_TAG=_NUMPY_DEV_1_8_x
59+
- NUMPY_BUILD=maintenance/1.8.x
5460
allow_failures:
5561
- python: 2.7
5662
env:
5763
- NOSE_ARGS="not slow and not network and not disabled"
58-
- JOB_NAME: "27_numpy_dev"
59-
- JOB_TAG=_NUMPY_DEV
60-
- NUMPY_BUILD=true # build numpy master from source
64+
- JOB_NAME: "27_numpy_master"
65+
- JOB_TAG=_NUMPY_DEV_master
66+
- NUMPY_BUILD=master
67+
- python: 2.7
68+
env:
69+
- NOSE_ARGS="not slow and not network and not disabled"
70+
- JOB_NAME: "27_numpy_1.8.x"
71+
- JOB_TAG=_NUMPY_DEV_1_8_x
72+
- NUMPY_BUILD=maintenance/1.8.x
6173

6274
# allow importing from site-packages,
6375
# so apt-get python-x works for system pythons

ci/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if [ -n "$NUMPY_BUILD" ]; then
5757
pip uninstall numpy -y
5858

5959
# clone & install
60-
git clone --branch master https://github.com/numpy/numpy.git numpy
60+
git clone --branch $NUMPY_BUILD https://github.com/numpy/numpy.git numpy
6161
cd numpy
6262
time sudo python setup.py install
6363

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
python-dateutil
2+
pytz==2013b
3+
cython==0.19.1

0 commit comments

Comments
 (0)