Fix installing numpy as a setup-time dependency

uswah · Sep 23, 2013 · 373c4d7 · 373c4d7
1 parent b512e49
commit 373c4d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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())