Skip to content

Commit 7e94753

Browse files
committed
BLD: use wheels and newer scipy bc of 33 scipy issue
1 parent a457fd5 commit 7e94753

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

ci/install.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ echo "inside $0"
2121
pip install -I git+https://github.com/pypa/pip@42102e9deaea99db08b681d06906c2945f6f95e2#egg=pip
2222
pv="${TRAVIS_PYTHON_VERSION:0:1}"
2323
[ "$pv" == "2" ] && pv=""
24-
[ "$pv" == "2" ] && DISTRIBUTE_VERSION="==0.6.35"
2524

26-
pip install -I distribute${DISTRIBUTE_VERSION}
25+
pip install -I -U setuptools
2726
pip install wheel
2827

2928
# comment this line to disable the fetching of wheel files
@@ -40,16 +39,13 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
4039
fi
4140

4241
time pip install $PIP_ARGS -r ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.txt
42+
time sudo apt-get install libatlas-base-dev gfortran
4343

4444
# Optional Deps
4545
if [ x"$FULL_DEPS" == x"true" ]; then
4646
echo "Installing FULL_DEPS"
47-
# for pytables gets the lib as well
47+
# for pytables gets the lib as well
4848
time sudo apt-get $APT_ARGS install libhdf5-serial-dev
49-
time sudo apt-get $APT_ARGS install python${pv}-bs4
50-
time sudo apt-get $APT_ARGS install python${pv}-scipy
51-
52-
time sudo apt-get $APT_ARGS remove python${pv}-lxml
5349

5450
# fool statsmodels into thinking pandas was already installed
5551
# so it won't refuse to install itself.

ci/requirements-2.7.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ xlrd==0.9.2
1212
patsy==0.1.0
1313
html5lib==1.0b2
1414
lxml==3.2.1
15-
scikits.timeseries==0.91.3
15+
http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r=
1616
MySQL-python==1.2.4
17+
scipy==0.10.0
18+
beautifulsoup4==4.2.1

ci/requirements-2.7_LOCALE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ matplotlib==1.2.1
1212
patsy==0.1.0
1313
html5lib==1.0b2
1414
lxml==3.2.1
15+
scipy==0.10.0
16+
beautifulsoup4==4.2.1

ci/requirements-3.2.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ tables==3.0.0
1010
matplotlib==1.2.1
1111
patsy==0.1.0
1212
lxml==3.2.1
13+
scipy==0.12.0
14+
beautifulsoup4==4.2.1

ci/requirements-3.3.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ tables==3.0.0
1010
matplotlib==1.2.1
1111
patsy==0.1.0
1212
lxml==3.2.1
13+
scipy==0.12.0
14+
beautifulsoup4==4.2.1

ci/speedpack/build.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ apt-add-repository ppa:fkrull/deadsnakes -y
1818
apt-get update
1919

2020
# install some deps and virtualenv
21-
apt-get install python-pip libfreetype6-dev libpng12-dev -y
21+
apt-get install python-pip libfreetype6-dev libpng12-dev libhdf5-serial-dev \
22+
g++ libatlas-base-dev gfortran -y
2223
pip install virtualenv
23-
apt-get install libhdf5-serial-dev g++ -y
2424
apt-get build-dep python-lxml -y
2525

2626
export PYTHONIOENCODING='utf-8'
27+
export VIRTUALENV_DISTRIBUTE=0
2728

2829
function generate_wheels() {
2930
# get the requirements file
@@ -50,11 +51,7 @@ function generate_wheels() {
5051

5152
# install pip setuptools
5253
pip install -I --download-cache /tmp 'git+https://github.com/pypa/pip@42102e9d#egg=pip'
53-
DISTRIBUTE_VERSION=
54-
if [ "${PY_MAJOR}" == "2" ]; then
55-
DISTRIBUTE_VERSION="==0.6.35"
56-
fi
57-
pip install -I --download-cache /tmp distribute${DISTRIBUTE_VERSION}
54+
pip install -I -U --download-cache /tmp setuptools
5855
pip install -I --download-cache /tmp wheel
5956

6057
# make the dir if it doesn't exist

0 commit comments

Comments
 (0)