diff --git a/setup.py b/setup.py index 18ff050ee6c4..ff7614794ab8 100644 --- a/setup.py +++ b/setup.py @@ -258,6 +258,7 @@ # List third-party Python packages that we require install_requires=install_requires, + setup_requires=setup_requires, # matplotlib has C/C++ extensions, so it's not zip safe. # Telling setuptools this prevents it from doing an automatic diff --git a/setupext.py b/setupext.py index 0a8b78c5a92b..bc17b3567574 100644 --- a/setupext.py +++ b/setupext.py @@ -711,7 +711,11 @@ class Numpy(SetupPackage): @staticmethod def include_dirs_hook(): + import __builtin__ + if hasattr(__builtin__, '__NUMPY_SETUP__'): + del __builtin__.__NUMPY_SETUP__ import numpy + reload(numpy) ext = Extension('test', []) ext.include_dirs.append(numpy.get_include())