Skip to content

Commit 513b8b7

Browse files
committed
BLD: pull wheel for numpy builds
1 parent 5475db3 commit 513b8b7

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

ci/install_travis.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,19 @@ else
103103
fi
104104

105105
# build deps
106+
echo "build installs"
106107
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build"
107-
108-
# install deps
109108
if [ -e ${REQ} ]; then
110109
time conda install -n pandas --file=${REQ} || exit 1
111110
fi
112111

112+
# may have addtl installation instructions for this build
113+
echo "build addtl installs"
114+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build.sh"
115+
if [ -e ${REQ} ]; then
116+
time bash $REQ || exit 1
117+
fi
118+
113119
source activate pandas
114120

115121
if [ "$BUILD_TEST" ]; then
@@ -140,6 +146,7 @@ else
140146
fi
141147

142148
# may have addtl installation instructions for this build
149+
echo "addtl installs"
143150
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.sh"
144151
if [ -e ${REQ} ]; then
145152
time bash $REQ || exit 1

ci/requirements-3.5_NUMPY_DEV.sh renamed to ci/requirements-3.5_NUMPY_DEV.build.sh

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ echo "install numpy master wheel"
77
# remove the system installed numpy
88
pip uninstall numpy -y
99

10-
# we need these for numpy
11-
12-
# these wheels don't play nice with the conda libgfortran / openblas
13-
# time conda install -n pandas libgfortran openblas || exit 1
14-
1510
# install numpy wheel from master
1611
pip install --pre --upgrade --no-index --timeout=60 --trusted-host travis-dev-wheels.scipy.org -f http://travis-dev-wheels.scipy.org/ numpy scipy
1712

0 commit comments

Comments
 (0)