Skip to content

Commit 2340fb8

Browse files
committed
BLD: fix 2.7_LOCALE build
simplify install_travis.sh, always using a clean miniconda install bump matplotlib to 1.4.0 for _LOCALE, numpy to 1.8.2 So this removes our testing of mpl 1.2.1 with numpy 1.7.1. We *still* test elsewhere 1.7.1, and mpl 1.3.1 (with 1.8.2) Author: Jeff Reback <[email protected]> Closes #15540 from jreback/build and squashes the following commits: 58b6f2f [Jeff Reback] BLD: fix 2.7_LOCALE build
1 parent d0a281f commit 2340fb8

File tree

3 files changed

+44
-54
lines changed

3 files changed

+44
-54
lines changed

ci/install_travis.sh

+40-48
Original file line numberDiff line numberDiff line change
@@ -32,58 +32,50 @@ edit_init
3232
home_dir=$(pwd)
3333
echo "[home_dir: $home_dir]"
3434

35-
MINICONDA_DIR="$HOME/miniconda3"
35+
# install miniconda
36+
echo "[Using clean Miniconda install]"
3637

37-
if [ -d "$MINICONDA_DIR" ] && [ -e "$MINICONDA_DIR/bin/conda" ] && [ "$USE_CACHE" ]; then
38-
echo "[Miniconda install already present from cache: $MINICONDA_DIR]"
39-
40-
conda config --set always_yes yes --set changeps1 no || exit 1
41-
echo "[update conda]"
42-
conda update -q conda || exit 1
43-
44-
# Useful for debugging any issues with conda
45-
conda info -a || exit 1
46-
47-
# set the compiler cache to work
48-
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
49-
echo "[Using ccache]"
50-
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
51-
gcc=$(which gcc)
52-
echo "[gcc: $gcc]"
53-
ccache=$(which ccache)
54-
echo "[ccache: $ccache]"
55-
export CC='ccache gcc'
56-
fi
38+
MINICONDA_DIR="$HOME/miniconda3"
39+
if [ -d "$MINICONDA_DIR" ]; then
40+
rm -rf "$MINICONDA_DIR"
41+
fi
5742

43+
# install miniconda
44+
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
45+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
46+
else
47+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
48+
fi
49+
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
50+
51+
echo "[update conda]"
52+
conda config --set ssl_verify false || exit 1
53+
conda config --set always_yes true --set changeps1 false || exit 1
54+
conda update -q conda
55+
56+
# add the pandas channel to take priority
57+
# to add extra packages
58+
echo "[add channels]"
59+
conda config --add channels pandas || exit 1
60+
conda config --remove channels defaults || exit 1
61+
conda config --add channels defaults || exit 1
62+
63+
conda install anaconda-client
64+
65+
# Useful for debugging any issues with conda
66+
conda info -a || exit 1
67+
68+
# set the compiler cache to work
69+
if [ "$USE_CACHE" ] && "${TRAVIS_OS_NAME}" == "linux" ]; then
70+
echo "[Using ccache]"
71+
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
72+
gcc=$(which gcc)
73+
echo "[gcc: $gcc]"
74+
ccache=$(which ccache)
75+
echo "[ccache: $ccache]"
76+
export CC='ccache gcc'
5877
else
59-
echo "[Using clean Miniconda install]"
6078
echo "[Not using ccache]"
61-
rm -rf "$MINICONDA_DIR"
62-
# install miniconda
63-
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
64-
wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
65-
else
66-
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
67-
fi
68-
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
69-
70-
echo "[update conda]"
71-
conda config --set ssl_verify false || exit 1
72-
conda config --set always_yes true --set changeps1 false || exit 1
73-
conda update -q conda
74-
75-
# add the pandas channel to take priority
76-
# to add extra packages
77-
echo "[add channels]"
78-
conda config --add channels pandas || exit 1
79-
conda config --remove channels defaults || exit 1
80-
conda config --add channels defaults || exit 1
81-
82-
conda install anaconda-client
83-
84-
# Useful for debugging any issues with conda
85-
conda info -a || exit 1
86-
8779
fi
8880

8981
# may have installation instructions for this build

ci/requirements-2.7_LOCALE.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
python-dateutil
22
pytz=2013b
3-
numpy=1.7.1
3+
numpy=1.8.2
44
cython=0.23

ci/requirements-2.7_LOCALE.run

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
python-dateutil
22
pytz=2013b
3-
numpy=1.7.1
3+
numpy=1.8.2
44
xlwt=0.7.5
55
openpyxl=1.6.2
66
xlsxwriter=0.4.6
77
xlrd=0.9.2
88
bottleneck=0.8.0
9-
matplotlib=1.2.1
10-
patsy=0.1.0
9+
matplotlib=1.3.1
1110
sqlalchemy=0.8.1
1211
html5lib=1.0b2
1312
lxml=3.2.1
14-
scipy=0.11.0
13+
scipy
1514
beautiful-soup=4.2.1
16-
bigquery=2.0.17

0 commit comments

Comments
 (0)