From 6c32be45a693d3f3d0f50d558be4b05f1bfb1a9a Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Thu, 16 Jul 2015 06:32:20 -0500
Subject: [PATCH] Do not try and upgrade larger dependencies on skimage install

---
 setup.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index 1337f9d2..e735026a 100644
--- a/setup.py
+++ b/setup.py
@@ -63,14 +63,14 @@ if __name__ == "__main__":
     try:
         from numpy.distutils.core import setup
         extra = {'configuration': configuration}
-        # do not risk updating numpy or scipy
-        INSTALL_REQUIRES = [r for r in INSTALL_REQUIRES if 'numpy' not in r]
-        try:
-            import scipy
-            INSTALL_REQUIRES = [r for r in INSTALL_REQUIRES if 'scipy'
-                                not in r]
-        except ImportError:
-            pass
+        # Do not try and upgrade larger dependencies
+        for lib in ['scipy', 'numpy', 'matplotlib', 'pillow']:
+            try:
+                __import__(lib)
+                INSTALL_REQUIRES = [i for i in INSTALL_REQUIRES
+                                    if lib not in i]
+            except ImportError:
+                pass
     except ImportError:
         if len(sys.argv) >= 2 and ('--help' in sys.argv[1:] or
                                    sys.argv[1] in ('--help-commands',