Skip to content

Commit 18d3893

Browse files
author
y-p
committed
BLD: Travis revamped their log widget, be verbose and fold furiously
1 parent d09fff8 commit 18d3893

File tree

3 files changed

+60
-32
lines changed

3 files changed

+60
-32
lines changed

Diff for: .travis.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
language: python
22

3+
# travis insist on having at least one entry here, rather then
4+
# all in the matrix section
35
python:
46
- 2.6
5-
- 3.3
67

78
env:
89
global:
@@ -16,6 +17,8 @@ matrix:
1617
env: FULL_DEPS=true
1718
- python: 3.2
1819
env: FULL_DEPS=true
20+
- python: 3.3
21+
1922

2023
# allow importing from site-packages,
2124
# so apt-get python-x works for system pythons
@@ -27,8 +30,8 @@ before_install:
2730
- echo "Waldo1"
2831
- echo $VIRTUAL_ENV
2932
- date
30-
- export PIP_ARGS=-q # comment this this to debug travis install issues
31-
- export APT_ARGS=-qq # comment this to debug travis install issues
33+
# - export PIP_ARGS=-q # comment this this to debug travis install issues
34+
# - export APT_ARGS=-qq # comment this to debug travis install issues
3235
# - set -x # enable this to see bash commands
3336
- source ci/before_install.sh # we need to source this to bring in the env
3437
- python -V

Diff for: ci/install.sh

+48-22
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,30 @@ echo "inside $0"
66
# workaround for travis ignoring system_site_packages in travis.yml
77
rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt
88

9+
function pip_install {
10+
NAME="$1"
11+
if [ x"$2" != x"$2" ]; then
12+
NAME=$2;
13+
fi
14+
echo "travis_fold:begin:$NAME"
15+
pip install $PIP_ARGS "$1"
16+
echo "travis_fold:end:$NAME"
17+
}
18+
function apt_install {
19+
NAME=$1
20+
if [ x"$2" != x"!2" ]; then
21+
NAME=$2;
22+
fi
23+
echo "travis_fold:begin:$NAME"
24+
sudo apt-get install $APT_ARGS "$1"
25+
echo "travis_fold:end:$NAME"
26+
}
27+
928
# Hard Deps
10-
pip install $PIP_ARGS --use-mirrors cython nose python-dateutil pytz
29+
pip_install cython
30+
pip_install nose
31+
pip_install python-dateutil
32+
pip_install pytz
1133

1234
# try and get numpy as a binary deb
1335

@@ -17,59 +39,63 @@ pip install $PIP_ARGS --use-mirrors cython nose python-dateutil pytz
1739
# fi
1840

1941
if [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
20-
sudo apt-get $APT_ARGS install python3-numpy;
42+
apt_install python3-numpy;
2143
elif [ ${TRAVIS_PYTHON_VERSION} == "3.3" ] || [ x"$LOCALE_OVERRIDE" != x"" ]; then # should be >=3,3
22-
pip $PIP_ARGS install https://github.com/numpy/numpy/archive/v1.7.0.tar.gz;
44+
pip_install numpy==1.7.0
2345
else
24-
pip install numpy==1.6.1
46+
pip_install numpy==1.6.1
2547
fi
2648

2749
# Optional Deps
2850
if [ x"$FULL_DEPS" == x"true" ]; then
2951
echo "Installing FULL_DEPS"
3052
if [ ${TRAVIS_PYTHON_VERSION} == "2.7" ]; then
31-
sudo apt-get $APT_ARGS install python-scipy;
53+
apt_install python-scipy;
3254
fi
3355

3456
if [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
35-
sudo apt-get $APT_ARGS install python3-scipy;
57+
apt_install $APT_ARGS install python3-scipy;
3658
fi
3759

3860
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
3961
sudo apt-get $APT_ARGS install libhdf5-serial-dev;
40-
pip install numexpr
41-
pip install tables
62+
pip_install numexpr
63+
pip_install tables
4264
fi
4365

44-
pip install $PIP_ARGS --use-mirrors openpyxl matplotlib;
45-
pip install $PIP_ARGS --use-mirrors xlrd xlwt;
46-
pip install $PIP_ARGS 'http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r='
66+
pip_install matplotlib;
67+
pip_install openpyxl;
68+
pip_install xlwt;
69+
pip_install xlrd ;
70+
pip_install 'http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r=' scikit.timeseries
4771
fi
4872

49-
if [ x"$VBENCH" == x"true" ]; then
50-
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
51-
sudo apt-get $APT_ARGS install libhdf5-serial-dev;
52-
pip install numexpr
53-
pip install tables
54-
fi
55-
pip $PIP_ARGS install sqlalchemy git+git://github.com/pydata/vbench.git;
56-
fi
73+
# if [ x"$VBENCH" == x"true" ]; then
74+
# if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
75+
# sudo apt-get $APT_ARGS install libhdf5-serial-dev;
76+
# pip install numexpr
77+
# pip install tables
78+
# fi
79+
# pip $PIP_ARGS install sqlalchemy git+git://github.com/pydata/vbench.git;
80+
# fi
5781

5882
#build and install pandas
83+
echo "travis_fold:begin:pandas-install"
5984
python setup.py build_ext install
85+
echo "travis_fold:end:pandas-install"
6086

6187
#HACK: pandas is a statsmodels dependency
6288
# so we need to install it after pandas
6389
if [ x"$FULL_DEPS" == x"true" ]; then
64-
pip install patsy
90+
pip_install patsy
6591
# pick recent 0.5dev dec/2012
66-
pip install git+git://github.com/statsmodels/statsmodels@c9062e43b8a5f7385537ca95#egg=statsmodels
92+
pip_install git+git://github.com/statsmodels/statsmodels@c9062e43b8a5f7385537ca95#egg=statsmodels statsmodels
6793
fi;
6894

6995
# make sure the desired locale is generated
7096
if [ x"$LOCALE_OVERRIDE" != x"" ]; then
7197
# piggyback this build for plotting tests. oh boy.
72-
pip install $PIP_ARGS --use-mirrors matplotlib;
98+
pip_install matplotlib;
7399

74100
sudo locale-gen "$LOCALE_OVERRIDE"
75101
fi

Diff for: ci/script.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ if [ x"$LOCALE_OVERRIDE" != x"" ]; then
1010
# also do slow tests here, especially plotting
1111
nosetests --exe -w /tmp -A "not network" pandas;
1212
exit
13-
fi
14-
15-
if [ x"$VBENCH" != x"true" ]; then
13+
elif [ x"$VBENCH" != x"true" ]; then
14+
# plain/FULL_DEPS
1615
nosetests --exe -w /tmp -A "not slow" pandas;
1716
exit
1817
fi
1918

20-
if [ x"$VBENCH" == x"true" ]; then
21-
python vb_suite/perf_HEAD.py;
22-
exit
23-
fi
19+
# if [ x"$VBENCH" == x"true" ]; then
20+
# python vb_suite/perf_HEAD.py;
21+
# exit
22+
# fi

0 commit comments

Comments
 (0)