File tree 2 files changed +9
-7
lines changed
2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -103,13 +103,19 @@ else
103
103
fi
104
104
105
105
# build deps
106
+ echo " build installs"
106
107
REQ=" ci/requirements-${PYTHON_VERSION}${JOB_TAG} .build"
107
-
108
- # install deps
109
108
if [ -e ${REQ} ]; then
110
109
time conda install -n pandas --file=${REQ} || exit 1
111
110
fi
112
111
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
+
113
119
source activate pandas
114
120
115
121
if [ " $BUILD_TEST " ]; then
140
146
fi
141
147
142
148
# may have addtl installation instructions for this build
149
+ echo " addtl installs"
143
150
REQ=" ci/requirements-${PYTHON_VERSION}${JOB_TAG} .sh"
144
151
if [ -e ${REQ} ]; then
145
152
time bash $REQ || exit 1
Original file line number Diff line number Diff line change @@ -7,11 +7,6 @@ echo "install numpy master wheel"
7
7
# remove the system installed numpy
8
8
pip uninstall numpy -y
9
9
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
-
15
10
# install numpy wheel from master
16
11
pip install --pre --upgrade --no-index --timeout=60 --trusted-host travis-dev-wheels.scipy.org -f http://travis-dev-wheels.scipy.org/ numpy scipy
17
12
You can’t perform that action at this time.
0 commit comments