From 61a78d6c693bcc27ac44dcabc124929ab18a4a3c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 30 Oct 2015 15:00:56 -0500 Subject: [PATCH] Fix setup.py in the presence of no numpy --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6c55c6d6..53b5aa71 100644 --- a/setup.py +++ b/setup.py @@ -87,14 +87,15 @@ if __name__ == "__main__": except ImportError: if len(sys.argv) >= 2 and ('--help' in sys.argv[1:] or sys.argv[1] in ('--help-commands', - 'egg_info', '--version', + '--version', 'clean')): # For these actions, NumPy is not required. # # They are required to succeed without Numpy for example when # pip is used to install scikit-image when Numpy is not yet # present in the system. - pass + from setuptools import setup + extra = {} else: print('To install scikit-image from source, you will need numpy.\n' + 'Install numpy with pip:\n' +