Skip to content

Commit 2102b68

Browse files
jrebackjreback
committed
Merge pull request #11127 from jreback/ci
BLD: install build deps when building
2 parents e198bed + a4138bd commit 2102b68

26 files changed

+74
-81
lines changed

‎ci/install_conda.sh

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,13 @@ conda config --set ssl_verify false || exit 1
7878
# Useful for debugging any issues with conda
7979
conda info -a || exit 1
8080

81-
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.txt"
82-
conda create -n pandas python=$TRAVIS_PYTHON_VERSION || exit 1
83-
conda install -n pandas --file=${REQ} || exit 1
84-
85-
conda install -n pandas pip setuptools nose || exit 1
86-
conda remove -n pandas pandas
81+
# build deps
82+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.build"
83+
time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose || exit 1
84+
time conda install -n pandas --file=${REQ} || exit 1
8785

8886
source activate pandas
8987

90-
# we may have additional pip installs
91-
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
92-
if [ -e ${REQ} ]; then
93-
pip install -r $REQ
94-
fi
95-
9688
# set the compiler cache to work
9789
if [ "$IRON_TOKEN" ]; then
9890
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
@@ -104,15 +96,33 @@ if [ "$IRON_TOKEN" ]; then
10496
fi
10597

10698
if [ "$BUILD_TEST" ]; then
99+
100+
# build testing
107101
pip uninstall --yes cython
108102
pip install cython==0.15.1
109103
( python setup.py build_ext --inplace && python setup.py develop ) || true
104+
110105
else
111-
python setup.py build_ext --inplace && python setup.py develop
112-
fi
113106

114-
for package in beautifulsoup4; do
115-
pip uninstall --yes $package
116-
done
107+
# build but don't install
108+
time python setup.py build_ext --inplace || exit 1
109+
110+
# we may have run installations
111+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.run"
112+
time conda install -n pandas --file=${REQ} || exit 1
113+
114+
# we may have additional pip installs
115+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
116+
if [ -e ${REQ} ]; then
117+
pip install -r $REQ
118+
fi
119+
120+
# remove any installed pandas package
121+
conda remove pandas
122+
123+
# install our pandas
124+
python setup.py develop || exit 1
125+
126+
fi
117127

118128
true

‎ci/install_pydata.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ fi
9090
# Force virtualenv to accept system_site_packages
9191
rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt
9292

93-
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt
93+
# build deps
94+
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.build
9495

9596
# Need to enable for locale testing. The location of the locale file(s) is
9697
# distro specific. For example, on Arch Linux all of the locales are in a
@@ -147,6 +148,9 @@ else
147148
python setup.py develop
148149
fi
149150

151+
# install the run libs
152+
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.run
153+
150154
# restore cython (if not numpy building)
151155
if [ -z "$NUMPY_BUILD" ]; then
152156
time pip install $PIP_ARGS $(cat ci/requirements-${wheel_box}.txt | grep -i cython)

‎ci/requirements-2.6.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
numpy=1.7.0
2+
cython=0.19.1
3+
dateutil=1.5
4+
pytz=2013b

‎ci/requirements-2.6.txt renamed to ‎ci/requirements-2.6.run

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
numpy=1.7.0
2-
cython=0.19.1
32
dateutil=1.5
43
pytz=2013b
54
scipy=0.11.0

‎ci/requirements-2.7.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dateutil=2.1
2+
pytz=2013b
3+
numpy=1.7.1
4+
cython=0.19.1

‎ci/requirements-2.7.txt renamed to ‎ci/requirements-2.7.run

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
dateutil=2.1
22
pytz=2013b
3+
numpy=1.7.1
34
xlwt=0.7.5
4-
numpy=1.7.0
5-
cython=0.19.1
65
numexpr=2.2.2
76
pytables=3.0.0
87
matplotlib=1.3.1
@@ -12,11 +11,11 @@ sqlalchemy=0.9.6
1211
lxml=3.2.1
1312
scipy
1413
xlsxwriter=0.4.6
15-
statsmodels
1614
boto=2.36.0
1715
bottleneck=0.8.0
1816
psycopg2=2.5.2
1917
patsy
2018
pymysql=0.6.3
2119
html5lib=1.0b2
2220
beautiful-soup=4.2.1
21+
statsmodels

‎ci/requirements-2.7_32.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ci/requirements-2.7_64.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ci/requirements-2.7_BUILD_TEST.txt renamed to ‎ci/requirements-2.7_BUILD_TEST.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ dateutil
22
pytz
33
numpy
44
cython
5-
nose

‎ci/requirements-2.7_LOCALE.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz=2013b
3+
numpy=1.7.1
4+
cython=0.19.1

‎ci/requirements-2.7_LOCALE.txt renamed to ‎ci/requirements-2.7_LOCALE.run

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
python-dateutil
22
pytz=2013b
3+
numpy=1.7.1
34
xlwt=0.7.5
45
openpyxl=1.6.2
56
xlsxwriter=0.4.6
67
xlrd=0.9.2
7-
numpy=1.7.1
8-
cython=0.19.1
98
bottleneck=0.8.0
109
matplotlib=1.2.1
1110
patsy=0.1.0

‎ci/requirements-2.7_NUMPY_DEV_1_8_x.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎ci/requirements-2.7_NUMPY_DEV_master.txt renamed to ‎ci/requirements-2.7_NUMPY_DEV_master.build

File renamed without changes.

‎ci/requirements-2.7_NUMPY_DEV_master.run

Whitespace-only changes.

‎ci/requirements-2.7_SLOW.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-2.7_SLOW.txt renamed to ‎ci/requirements-2.7_SLOW.run

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
python-dateutil
22
pytz
33
numpy
4-
cython
54
matplotlib
65
scipy
76
patsy

‎ci/requirements-3.3.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz=2013b
3+
numpy=1.8.0
4+
cython=0.19.1

‎ci/requirements-3.3.txt renamed to ‎ci/requirements-3.3.run

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
python-dateutil
22
pytz=2013b
3+
numpy=1.8.0
34
openpyxl=1.6.2
45
xlsxwriter=0.4.6
56
xlrd=0.9.2
67
html5lib=1.0b2
7-
numpy=1.8.0
8-
cython=0.19.1
98
numexpr
109
pytables
1110
bottleneck=0.8.0

‎ci/requirements-3.4.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-3.4_SLOW.txt renamed to ‎ci/requirements-3.4.run

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
python-dateutil
22
pytz
3+
numpy
34
openpyxl
45
xlsxwriter
56
xlrd
67
xlwt
78
html5lib
89
patsy
910
beautiful-soup
10-
numpy
11-
cython
1211
scipy
1312
numexpr
1413
pytables
1514
matplotlib=1.3.1
1615
lxml
1716
sqlalchemy
1817
bottleneck
19-
pymysql
18+
pymysql=0.6.3
2019
psycopg2

‎ci/requirements-3.4_32.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ci/requirements-3.4_64.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ci/requirements-3.4_SLOW.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-3.4.txt renamed to ‎ci/requirements-3.4_SLOW.run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
python-dateutil
22
pytz
3+
numpy
34
openpyxl
45
xlsxwriter
56
xlrd
67
xlwt
78
html5lib
89
patsy
910
beautiful-soup
10-
numpy
11-
cython
1211
scipy
1312
numexpr
1413
pytables
1514
matplotlib
1615
lxml
1716
sqlalchemy
1817
bottleneck
19-
pymysql==0.6.3
18+
pymysql
2019
psycopg2
20+
statsmodels

‎ci/requirements-3.5.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-3.5.txt renamed to ‎ci/requirements-3.5.run

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
python-dateutil
22
pytz
3+
numpy
34
openpyxl
45
xlsxwriter
56
xlrd
67
xlwt
78
patsy
8-
numpy
9-
cython
109
scipy
1110
numexpr
1211
pytables

0 commit comments

Comments
 (0)