Merge pull request #1825 from stefanv/travis_pyamg

Re-enable pyamg, since release 3.0.2 closes #1788

TODO.txt

@@ -31,7 +31,7 @@ Version 0.13
   involves removing the function _mode_deprecations from skimage._shared.utils
   as well as any uses of _mode_deprecations from restoration/_denoise.py,
   _shared/interpolation.pyx, transform/_geometric.py, and transform/_warps.py
-* Re-enable pyamg in Travis tests
+
 
 
 Version 0.12

tools/travis_script.sh

@@ -45,13 +45,9 @@ elif [[ $PY != 3.2* ]]; then
     python ~/venv/bin/pyside_postinstall.py -install
 fi
 
-## Disable pyamg until
-## https://github.com/scikit-image/scikit-image/issues/1788
-## is closed
-
-#if [[ $PY == 2.* ]]; then
-#    pip install --retries 3 -q pyamg
-#fi
+if [[ $PY == 2.* ]]; then
+    pip install --retries 3 -q pyamg
+fi
 
 # Show what's installed
 pip list