diff --git a/.travis.yml b/.travis.yml index 3a061e13..a2c99f97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/skimage/_shared/LICENSE.txt b/skimage/_shared/LICENSE.txt new file mode 100644 index 00000000..69293997 --- /dev/null +++ b/skimage/_shared/LICENSE.txt @@ -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. diff --git a/skimage/_shared/version_requirements.py b/skimage/_shared/version_requirements.py index 4ebf8ee9..430f7f5e 100644 --- a/skimage/_shared/version_requirements.py +++ b/skimage/_shared/version_requirements.py @@ -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 ---- diff --git a/skimage/viewer/canvastools/painttool.py b/skimage/viewer/canvastools/painttool.py index fd994a10..9b94e0a2 100644 --- a/skimage/viewer/canvastools/painttool.py +++ b/skimage/viewer/canvastools/painttool.py @@ -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