Skip to content

Commit 244d567

Browse files
author
y-p
committed
CLN: remove unused travis network build cache, simplify ci/
1 parent b3f16da commit 244d567

File tree

5 files changed

+86
-320
lines changed

5 files changed

+86
-320
lines changed

‎.travis.yml

-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ python:
55

66
env:
77
global:
8-
- secure: "O04RU5QRKEDL/SrIWEsVe8O+1TxZqZQSa28Sd+Fz48NW/XddhefYyxzqcUXh\nk/NjWMqknJRQhApLolBianVpsE577OTllzlcyKn3nUL6hjOXcoszGaYray7S\niNGKGyO8xrtB/ZQDtmupz0ksK8sLoCTscdiGotFulczbx0zt+4g="
9-
- secure: "PUJ9nC1/v2vpFUtELSoSjI53OHCVXfFTb8+t5lIGIqHtjUBkhiJSNPfCv8Bx\ndsdrx30qP8KsSceYzaa/bog6p8YNU1iih23S0KbjucutvA0LNHBTNvnxmjBR\nSJfKd5FmwnXvizRyghYBzmQ3NmGO7ADw2DBwKOhgGMqCHZ8Tlc8="
10-
- secure: "IDcMrCCW+6pgJtsI3Q163OPc0iec1ogpitaqiRhHcrEBUCXZgVeclOeiZBlw\n/u+uGyW/O0NhHMaFXKB8BdDVwlQEEHv48syN6npS/A5+O6jriWKL4ozttOhE\npOlu+yLhHnEwx6wZVIHRTVn+t1GkOrjlBcjaQi+Z13G3XmDaSG8="
11-
- secure: "Zu9aj0dTGpvMqT/HqBGQgDYl/v5ubC7lFwfE8Fqb0N1UVXqbpjXnNH/7oal1\nUsIT7klO++LWm+LxsP/A1FWENTSgdYe99JQtNyauW+0x5YR1JTuDJ8atDgx9\nSq66CaVpS5t+ov7UVm2bKSUX+1S8+8zGbIDADrMxEzYEMF7WoGM="
12-
- secure: "AfIvLxvCxj22zrqg3ejGf/VePKT2AyGT9erYzlKpBS0H8yi5Pp1MfmJjhaR4\n51zBtzqHPHiIEY6ZdE06o9PioMWkXS+BqJNrxGSbt1ltxgOFrxW5zOpwiFGZ\nZOv1YeFkuPf8PEsWT7615mdydqTQT7B0pqUKK/d6aka4TQ/tg5Q="
13-
- secure: "EM4ySBUusReNu7H1QHXvjnP/J1QowvfpwEBmjysYxJuq7KcG8HhhlfpUF+Gh\nLBzLak9QBA67k4edhum3qtKuJR5cHuja3+zuV8xmx096B/m96liJFTrwZpea\n58op3W6ZULctEpQNgIkyae20bjxl4f99JhZRUlonoPfx/rBIMFc="
14-
- secure: "pgMYS/6MQqDGb58qdzTJesvAMmcJWTUEEM8gf9rVbfqfxceOL4Xpx8siR9B2\nC4U4MW1cHMPP3RFEb4Jy0uK49aHH10snwZY1S84YPPllpH5ZFXVdN68OayNj\nh4k5N/2hhaaQuJ6Uh8v8s783ye4oYTOW5RJUFqQu4QdG4IkTIMs="
15-
168
- NOSE_ARGS="not slow" UPLOAD=true
179

1810
matrix:
@@ -41,7 +33,6 @@ before_install:
4133
# - export APT_ARGS=-qq # comment this to debug travis install issues
4234
# - set -x # enable this to see bash commands
4335
- export ZIP_FLAGS=-q # comment this to debug travis install issues
44-
- source ci/envars.sh # we need to source this to bring in the envars
4536
- ci/before_install.sh
4637
- python -V
4738

‎ci/before_install.sh

-23
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,4 @@ echo "inside $0"
1010
# overview
1111
sudo apt-get update $APT_ARGS # run apt-get update for all versions
1212

13-
if $PLEASE_TRAVIS_FASTER ; then
14-
echo "Faster? well... I'll try."
15-
16-
if $CACHE_FILE_AVAILABLE ; then
17-
echo retrieving "$CACHE_FILE_URL";
18-
19-
wget -q "$CACHE_FILE_URL" -O "/tmp/_$CYTHON_HASH.zip";
20-
unzip $ZIP_FLAGS /tmp/_"$CYTHON_HASH.zip" -d "$BUILD_CACHE_DIR";
21-
rm -f /tmp/_"$CYTHON_HASH.zip"
22-
# copy cythonized c files over
23-
cp -R "$BUILD_CACHE_DIR"/pandas/*.c pandas/
24-
cp -R "$BUILD_CACHE_DIR"/pandas/src/*.c pandas/src/
25-
fi;
26-
echo "VENV_FILE_AVAILABLE=$VENV_FILE_AVAILABLE"
27-
if $VENV_FILE_AVAILABLE ; then
28-
echo "getting venv"
29-
wget -q $VENV_FILE_URL -O "/tmp/venv.zip";
30-
sudo unzip $ZIP_FLAGS -o /tmp/venv.zip -d "/";
31-
sudo chown travis -R "$VIRTUAL_ENV"
32-
rm -f /tmp/_"$CYTHON_HASH.zip"
33-
fi;
34-
fi
35-
3613
true # never fail because bad things happened here

‎ci/envars.sh

-67
This file was deleted.

‎ci/install.sh

+44-86
Original file line numberDiff line numberDiff line change
@@ -45,102 +45,60 @@ if [ x"$FULL_DEPS" == x"true" ] ; then
4545
fi
4646
fi
4747

48-
# Everything installed inside this clause into site-packages
49-
# will get included in the cached venv downloaded from the net
50-
# in PTF mode
51-
if ( ! $VENV_FILE_AVAILABLE ); then
52-
echo "Running full monty"
53-
# Hard Deps
54-
pip install $PIP_ARGS nose python-dateutil pytz
48+
# Hard Deps
49+
pip install $PIP_ARGS nose python-dateutil pytz
50+
pip install $PIP_ARGS cython
51+
52+
if [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
53+
pip install $PIP_ARGS numpy==1.7.0
54+
elif [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
55+
# sudo apt-get $APT_ARGS install python3-numpy; # 1.6.2 or precise
56+
pip install $PIP_ARGS numpy==1.6.1
57+
else
58+
pip install $PIP_ARGS numpy==1.6.1
59+
fi
60+
61+
# Optional Deps
62+
if [ x"$FULL_DEPS" == x"true" ]; then
63+
echo "Installing FULL_DEPS"
5564
pip install $PIP_ARGS cython
5665

57-
if [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
58-
pip install $PIP_ARGS numpy==1.7.0
59-
elif [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
60-
# sudo apt-get $APT_ARGS install python3-numpy; # 1.6.2 or precise
61-
pip install $PIP_ARGS numpy==1.6.1
66+
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
67+
pip install $PIP_ARGS xlwt
68+
pip install $PIP_ARGS bottleneck
69+
pip install $PIP_ARGS numexpr==2.0.1
70+
pip install $PIP_ARGS tables==2.3.1
6271
else
63-
pip install $PIP_ARGS numpy==1.6.1
72+
pip install $PIP_ARGS numexpr
73+
pip install $PIP_ARGS tables
6474
fi
6575

66-
# Optional Deps
67-
if [ x"$FULL_DEPS" == x"true" ]; then
68-
echo "Installing FULL_DEPS"
69-
pip install $PIP_ARGS cython
70-
71-
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
72-
pip install $PIP_ARGS xlwt
73-
pip install $PIP_ARGS bottleneck
74-
pip install $PIP_ARGS numexpr==2.0.1
75-
pip install $PIP_ARGS tables==2.3.1
76-
else
77-
pip install $PIP_ARGS numexpr
78-
pip install $PIP_ARGS tables
79-
fi
80-
81-
pip install $PIP_ARGS matplotlib
82-
pip install $PIP_ARGS openpyxl
83-
pip install $PIP_ARGS xlrd>=0.9.0
84-
pip install $PIP_ARGS 'http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r='
85-
pip install $PIP_ARGS patsy
86-
pip install $PIP_ARGS html5lib
87-
88-
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then
89-
sudo apt-get $APT_ARGS remove python3-lxml
90-
elif [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
91-
sudo apt-get $APT_ARGS remove python-lxml
92-
fi
93-
94-
pip install $PIP_ARGS lxml
95-
# fool statsmodels into thinking pandas was already installed
96-
# so it won't refuse to install itself. We want it in the zipped venv
97-
98-
mkdir $SITE_PKG_DIR/pandas
99-
touch $SITE_PKG_DIR/pandas/__init__.py
100-
echo "version='0.10.0-phony'" > $SITE_PKG_DIR/pandas/version.py
101-
pip install $PIP_ARGS git+git://github.com/statsmodels/statsmodels@c9062e43b8a5f7385537ca95#egg=statsmodels
102-
103-
rm -Rf $SITE_PKG_DIR/pandas # scrub phoney pandas
76+
pip install $PIP_ARGS matplotlib
77+
pip install $PIP_ARGS openpyxl
78+
pip install $PIP_ARGS xlrd>=0.9.0
79+
pip install $PIP_ARGS 'http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r='
80+
pip install $PIP_ARGS patsy
81+
pip install $PIP_ARGS html5lib
82+
83+
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then
84+
sudo apt-get $APT_ARGS remove python3-lxml
85+
elif [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
86+
sudo apt-get $APT_ARGS remove python-lxml
10487
fi
10588

106-
# pack up the venv and cache it
107-
if [ x"$STORE_KEY" != x"" ] && $UPLOAD && $PLEASE_TRAVIS_FASTER ; then
108-
VENV_FNAME="venv-$TRAVIS_PYTHON_VERSION.zip"
109-
110-
zip $ZIP_FLAGS -r "$HOME/$VENV_FNAME" $SITE_PKG_DIR/
111-
ls -l "$HOME/$VENV_FNAME"
112-
echo "posting venv"
113-
# silent, don't expose key
114-
curl -s --form upload=@"$HOME/$VENV_FNAME" "$CACHE_FILE_STORE_URL/$VENV_FNAME"
115-
fi
89+
pip install $PIP_ARGS lxml
90+
# fool statsmodels into thinking pandas was already installed
91+
# so it won't refuse to install itself.
11692

117-
fi;
93+
mkdir $SITE_PKG_DIR/pandas
94+
touch $SITE_PKG_DIR/pandas/__init__.py
95+
echo "version='0.10.0-phony'" > $SITE_PKG_DIR/pandas/version.py
96+
pip install $PIP_ARGS git+git://github.com/statsmodels/statsmodels@c9062e43b8a5f7385537ca95#egg=statsmodels
11897

119-
#build and install pandas
120-
if [ x"$BUILD_CACHE_DIR" != x"" ]; then
121-
scripts/use_build_cache.py -d
122-
python setup.py install;
123-
else
124-
python setup.py build_ext install
98+
rm -Rf $SITE_PKG_DIR/pandas # scrub phoney pandas
12599
fi
126100

127-
# package pandas build artifacts and send them home
128-
# that's everything the build cache (scripts/use_build_cache.py)
129-
# stored during the build (.so, pyx->.c and 2to3)
130-
if (! $CACHE_FILE_AVAILABLE) ; then
131-
if [ x"$STORE_KEY" != x"" ] && $UPLOAD && $PLEASE_TRAVIS_FASTER ; then
132-
echo "Posting artifacts"
133-
strip "$BUILD_CACHE_DIR/*" &> /dev/null
134-
echo "$BUILD_CACHE_DIR"
135-
cd "$BUILD_CACHE_DIR"/
136-
zip -r $ZIP_FLAGS "$HOME/$CYTHON_HASH".zip *
137-
cd "$TRAVIS_BUILD_DIR"
138-
pwd
139-
zip "$HOME/$CYTHON_HASH".zip $(find pandas | grep -P '\.(pyx|pxd)$' | sed -r 's/.(pyx|pxd)$/.c/')
140-
141-
# silent, don't expose key
142-
curl --connect-timeout 5 -s --form upload=@"$HOME/$CYTHON_HASH".zip "$CACHE_FILE_STORE_URL/$CYTHON_HASH.zip"
143-
fi
144-
fi
101+
# build pandas
102+
python setup.py build_ext install
145103

146104
true

0 commit comments

Comments
 (0)