diff --git a/ci/install.sh b/ci/install.sh index 5c681a707ce49..1b7ec3f647763 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -21,9 +21,8 @@ echo "inside $0" pip install -I git+https://github.com/pypa/pip@42102e9deaea99db08b681d06906c2945f6f95e2#egg=pip pv="${TRAVIS_PYTHON_VERSION:0:1}" [ "$pv" == "2" ] && pv="" -[ "$pv" == "2" ] && DISTRIBUTE_VERSION="==0.6.35" -pip install -I distribute${DISTRIBUTE_VERSION} +pip install -I -U setuptools pip install wheel # comment this line to disable the fetching of wheel files @@ -40,16 +39,13 @@ if [ -n "$LOCALE_OVERRIDE" ]; then fi time pip install $PIP_ARGS -r ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.txt +time sudo apt-get install libatlas-base-dev gfortran # Optional Deps if [ x"$FULL_DEPS" == x"true" ]; then echo "Installing FULL_DEPS" - # for pytables gets the lib as well + # for pytables gets the lib as well time sudo apt-get $APT_ARGS install libhdf5-serial-dev - time sudo apt-get $APT_ARGS install python${pv}-bs4 - time sudo apt-get $APT_ARGS install python${pv}-scipy - - time sudo apt-get $APT_ARGS remove python${pv}-lxml # fool statsmodels into thinking pandas was already installed # so it won't refuse to install itself. diff --git a/ci/requirements-2.7.txt b/ci/requirements-2.7.txt index a65a2991c673c..c39f5301c5d39 100644 --- a/ci/requirements-2.7.txt +++ b/ci/requirements-2.7.txt @@ -12,5 +12,7 @@ xlrd==0.9.2 patsy==0.1.0 html5lib==1.0b2 lxml==3.2.1 -scikits.timeseries==0.91.3 +http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r= MySQL-python==1.2.4 +scipy==0.10.0 +beautifulsoup4==4.2.1 diff --git a/ci/requirements-2.7_LOCALE.txt b/ci/requirements-2.7_LOCALE.txt index 9c9306bdf1872..70c398816f23c 100644 --- a/ci/requirements-2.7_LOCALE.txt +++ b/ci/requirements-2.7_LOCALE.txt @@ -12,3 +12,5 @@ matplotlib==1.2.1 patsy==0.1.0 html5lib==1.0b2 lxml==3.2.1 +scipy==0.10.0 +beautifulsoup4==4.2.1 diff --git a/ci/requirements-3.2.txt b/ci/requirements-3.2.txt index c72ccb06f5167..4b63fe3215973 100644 --- a/ci/requirements-3.2.txt +++ b/ci/requirements-3.2.txt @@ -10,3 +10,5 @@ tables==3.0.0 matplotlib==1.2.1 patsy==0.1.0 lxml==3.2.1 +scipy==0.12.0 +beautifulsoup4==4.2.1 diff --git a/ci/requirements-3.3.txt b/ci/requirements-3.3.txt index c00c51f4ab7d2..eb1e725d98040 100644 --- a/ci/requirements-3.3.txt +++ b/ci/requirements-3.3.txt @@ -10,3 +10,5 @@ tables==3.0.0 matplotlib==1.2.1 patsy==0.1.0 lxml==3.2.1 +scipy==0.12.0 +beautifulsoup4==4.2.1 diff --git a/ci/speedpack/build.sh b/ci/speedpack/build.sh index 39994fb3f30d6..d19c6da8a86ed 100755 --- a/ci/speedpack/build.sh +++ b/ci/speedpack/build.sh @@ -18,12 +18,13 @@ apt-add-repository ppa:fkrull/deadsnakes -y apt-get update # install some deps and virtualenv -apt-get install python-pip libfreetype6-dev libpng12-dev -y +apt-get install python-pip libfreetype6-dev libpng12-dev libhdf5-serial-dev \ + g++ libatlas-base-dev gfortran -y pip install virtualenv -apt-get install libhdf5-serial-dev g++ -y apt-get build-dep python-lxml -y export PYTHONIOENCODING='utf-8' +export VIRTUALENV_DISTRIBUTE=0 function generate_wheels() { # get the requirements file @@ -50,11 +51,7 @@ function generate_wheels() { # install pip setuptools pip install -I --download-cache /tmp 'git+https://github.com/pypa/pip@42102e9d#egg=pip' - DISTRIBUTE_VERSION= - if [ "${PY_MAJOR}" == "2" ]; then - DISTRIBUTE_VERSION="==0.6.35" - fi - pip install -I --download-cache /tmp distribute${DISTRIBUTE_VERSION} + pip install -I -U --download-cache /tmp setuptools pip install -I --download-cache /tmp wheel # make the dir if it doesn't exist