Skip to content

Commit 53d663e

Browse files
committed
BLD: pull wheel for numpy builds
1 parent 5475db3 commit 53d663e

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

ci/install_travis.sh

+28-20
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,48 @@
1616
function edit_init()
1717
{
1818
if [ -n "$LOCALE_OVERRIDE" ]; then
19-
echo "Adding locale to the first line of pandas/__init__.py"
19+
echo "[Adding locale to the first line of pandas/__init__.py]"
2020
rm -f pandas/__init__.pyc
2121
sedc="3iimport locale\nlocale.setlocale(locale.LC_ALL, '$LOCALE_OVERRIDE')\n"
2222
sed -i "$sedc" pandas/__init__.py
23-
echo "head -4 pandas/__init__.py"
23+
echo "[head -4 pandas/__init__.py]"
2424
head -4 pandas/__init__.py
2525
echo
2626
fi
2727
}
2828

29+
echo "[install_travis]"
2930
edit_init
3031

3132
home_dir=$(pwd)
32-
echo "home_dir: [$home_dir]"
33+
echo "[home_dir: $home_dir]"
3334

3435
MINICONDA_DIR="$HOME/miniconda3"
3536

3637
if [ -d "$MINICONDA_DIR" ] && [ -e "$MINICONDA_DIR/bin/conda" ] && [ "$USE_CACHE" ]; then
37-
echo "Miniconda install already present from cache: $MINICONDA_DIR"
38+
echo "[Miniconda install already present from cache: $MINICONDA_DIR]"
3839

3940
conda config --set always_yes yes --set changeps1 no || exit 1
40-
echo "update conda"
41+
echo "[update conda]"
4142
conda update -q conda || exit 1
4243

4344
# Useful for debugging any issues with conda
4445
conda info -a || exit 1
4546

4647
# set the compiler cache to work
4748
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
48-
echo "Using ccache"
49+
echo "[Using ccache]"
4950
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
5051
gcc=$(which gcc)
51-
echo "gcc: $gcc"
52+
echo "[gcc: $gcc]"
5253
ccache=$(which ccache)
53-
echo "ccache: $ccache"
54+
echo "[ccache: $ccache]"
5455
export CC='ccache gcc'
5556
fi
5657

5758
else
58-
echo "Using clean Miniconda install"
59-
echo "Not using ccache"
59+
echo "[Using clean Miniconda install]"
60+
echo "[Not using ccache]"
6061
rm -rf "$MINICONDA_DIR"
6162
# install miniconda
6263
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
@@ -66,14 +67,14 @@ else
6667
fi
6768
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
6869

69-
echo "update conda"
70+
echo "[update conda]"
7071
conda config --set ssl_verify false || exit 1
7172
conda config --set always_yes true --set changeps1 false || exit 1
7273
conda update -q conda
7374

7475
# add the pandas channel to take priority
7576
# to add extra packages
76-
echo "add channels"
77+
echo "[add channels]"
7778
conda config --add channels pandas || exit 1
7879
conda config --remove channels defaults || exit 1
7980
conda config --add channels defaults || exit 1
@@ -103,13 +104,19 @@ else
103104
fi
104105

105106
# build deps
107+
echo "[build installs]"
106108
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build"
107-
108-
# install deps
109109
if [ -e ${REQ} ]; then
110110
time conda install -n pandas --file=${REQ} || exit 1
111111
fi
112112

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

115122
if [ "$BUILD_TEST" ]; then
@@ -122,39 +129,40 @@ if [ "$BUILD_TEST" ]; then
122129
else
123130

124131
# build but don't install
125-
echo "build em"
132+
echo "[build em]"
126133
time python setup.py build_ext --inplace || exit 1
127134

128135
# we may have run installations
129-
echo "conda installs"
136+
echo "[conda installs]"
130137
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.run"
131138
if [ -e ${REQ} ]; then
132139
time conda install -n pandas --file=${REQ} || exit 1
133140
fi
134141

135142
# we may have additional pip installs
136-
echo "pip installs"
143+
echo "[pip installs]"
137144
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.pip"
138145
if [ -e ${REQ} ]; then
139146
pip install --upgrade -r $REQ
140147
fi
141148

142149
# may have addtl installation instructions for this build
150+
echo "[addtl installs]"
143151
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.sh"
144152
if [ -e ${REQ} ]; then
145153
time bash $REQ || exit 1
146154
fi
147155

148156
# remove any installed pandas package
149157
# w/o removing anything else
150-
echo "removing installed pandas"
158+
echo "[removing installed pandas]"
151159
conda remove pandas --force
152160

153161
# install our pandas
154-
echo "running setup.py develop"
162+
echo "[running setup.py develop]"
155163
python setup.py develop || exit 1
156164

157165
fi
158166

159-
echo "done"
167+
echo "[done]"
160168
exit 0

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)