From 8be859829eea67195d9693dd06b718b11132d349 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Sun, 13 Dec 2015 19:51:36 -0800 Subject: [PATCH] Re-enable pyamg, since release 3.0.2 closes #1788 This reverts commit a9b4e7893418b241975657e169d4c78259930a21. --- TODO.txt | 2 +- tools/travis_script.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/TODO.txt b/TODO.txt index 50db98ba..3f73ebdb 100644 --- a/TODO.txt +++ b/TODO.txt @@ -30,7 +30,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 diff --git a/tools/travis_script.sh b/tools/travis_script.sh index 5ade954d..d3cdb221 100755 --- a/tools/travis_script.sh +++ b/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