Make suggested changes to build update and use travis_retry for all installs.

This commit is contained in:
Steven Silvester
2014-08-11 17:01:53 -05:00
parent 3bc3b4f8e3
commit 72f6a8c056
4 changed files with 20 additions and 8 deletions
+6 -6
View File
@@ -32,7 +32,7 @@ before_install:
sudo apt-get install python3-numpy;
wget https://raw.githubusercontent.com/numpy/numpy/master/numpy/_import_tools.py -O /home/travis/virtualenv/python3.2_with_system_site_packages/lib/python3.2/site-packages/numpy/_import_tools.py;
sudo apt-get install python3-scipy;
pip install cython flake8 six;
travis_retry pip install cython flake8 six;
else
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
bash miniconda.sh -b -p $HOME/miniconda;
@@ -44,7 +44,7 @@ before_install:
travis_retry conda create -n test $ENV six scipy pip flake8 nose;
source activate test;
fi
- pip install coveralls pillow
- travis_retry pip install coveralls pillow
- python check_bento_build.py
install:
@@ -69,16 +69,16 @@ script:
# https://groups.google.com/a/continuum.io/forum/#!topic/anaconda/-DLG2ZdTkw0
- if [[ $ENV == python=3.2 ]]; then
sudo apt-get install -qq python3-pyqt4;
pip install --use-mirrors -q matplotlib;
pip install -q networkx;
travis_retry pip install -q matplotlib;
travis_retry pip install -q networkx;
else
travis_retry conda install -q matplotlib pyqt networkx;
sudo cp ~/miniconda/envs/test/include/png* /usr/include;
rm ~/miniconda/envs/test/lib/libm-2.5.so;
rm ~/miniconda/envs/test/lib/libm.*;
sudo apt-get install -qq libtiff4-dev libwebp-dev xcftools;
pip install -q imread;
pip install -q pyfits;
travis_retry pip install -q imread;
travis_retry pip install -q pyfits;
fi
- sudo apt-get install -qq libfreeimage3
# TODO: update when SimpleITK become available on py34 or hopefully pip
+12
View File
@@ -0,0 +1,12 @@
version_requirements._check_version:
Copyright (C) 2013 The IPython Development Team
Distributed under the terms of the BSD License.
version_requirements.is_installed:
Original Copyright (C) 2009-2011 Pierre Raybaut
Licensed under the terms of the MIT License.
+1 -1
View File
@@ -55,7 +55,7 @@ def is_installed(name, version=None):
Returns
-------
out : bool
True if *name* is installed matching the optional version.
True if `name` is installed matching the optional version.
Note
----
+1 -1
View File
@@ -3,7 +3,7 @@ try:
import matplotlib.pyplot as plt
import matplotlib.colors as mcolors
LABELS_CMAP = mcolors.ListedColormap(['white', 'red', 'dodgerblue', 'gold',
'greenyellow', 'blueviolet'])
'greenyellow', 'blueviolet'])
except ImportError:
pass
from skimage.viewer.canvastools.base import CanvasToolBase