diff --git a/requirements.txt b/requirements.txt index 58f28211..8b97dd4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ matplotlib>=1.1.0 numpy>=1.6.1 -scipy>=0.9 +scipy>=0.9.0 six>=1.4 networkx>=1.8 pillow>=1.7.8 diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh index 9da5f2e0..275e1ef5 100755 --- a/tools/travis_before_install.sh +++ b/tools/travis_before_install.sh @@ -10,8 +10,7 @@ export DISPLAY=:99.0 export PYTHONWARNINGS="all" export TEST_ARGS="--exe --ignore-files=^_test -v --with-doctest \ --ignore-files=^setup.py$" -export WHEELBINARIES="matplotlib numpy scipy pillow cython" - +WHEELBINARIES="matplotlib numpy scipy pillow cython" retry () { # https://gist.github.com/fungusakafungus/1026804 @@ -30,13 +29,15 @@ retry () { return 0 } +# add build dependencies +echo "cython>=0.21" >> requirements.txt -# test with minimum requirements on 2.7 +# test minimum requirements on 2.7 if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then sed -i 's/>=/==/g' requirements.txt # PIL instead of Pillow - sed -i '/pillow/d' requirements.txt - export WHEELBINARIES=${WHEELBINARIES/pillow/pil} + sed -i 's/pillow.*/pil==1.1.7/g' requirements.txt + WHEELBINARIES=${WHEELBINARIES/pillow/pil} fi # create new empty venv @@ -54,7 +55,12 @@ if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then sed -i 's/matplotlib>=.*/matplotlib==1.3.1/g' requirements.txt fi -retry pip install $WHEELHOUSE $WHEELBINARIES +# install wheels +for requirement in $WHEELBINARIES; do + WHEELS="$WHEELS $(grep $requirement requirements.txt)" +done +retry pip install $WHEELHOUSE $WHEELS + retry pip install -r requirements.txt # clean up disk space