Fix some things on Travis

- Now using the latest pip
- imread wasn't actually being installed
- Optional package installation uses a requirements file
- `python setup.py develop` instead of the previous two-step.
This commit is contained in:
John Wiggins
2015-08-30 13:50:03 +02:00
parent 069c575955
commit 05e6c0cb76
3 changed files with 16 additions and 27 deletions
+3 -17
View File
@@ -20,6 +20,9 @@ section_end "Flake8.test"
section "Install.optional.dependencies"
# Install most of the optional packages
pip install --retries 3 -q -r ./optional_requirements.txt $WHEELHOUSE
# Install Qt and then update the Matplotlib settings
if [[ $PY == 2.7* ]]; then
# http://stackoverflow.com/a/9716100
@@ -37,30 +40,13 @@ if [[ $PY == 2.7* ]]; then
done
else
retry pip install -q PySide $WHEELHOUSE
python ~/venv/bin/pyside_postinstall.py -install
fi
# Install imread from wheelhouse if available (not 3.2)
if [[ $PY != 3.2 ]]; then
retry pip install -q $WHEELHOUSE
fi
# Install SimpleITK from wheelhouse if available (not 3.2 or 3.4)
if [[ $PY =~ 3\.[24] ]]; then
echo "SimpleITK unavailable on $PY"
else
retry pip install -q SimpleITK $WHEELHOUSE
fi
retry pip install -q astropy $WHEELHOUSE
if [[ $PY == 2.* ]]; then
retry pip install -q pyamg
fi
retry pip install -q tifffile
section_end "Install.optional.dependencies"