summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-09-03 09:52:15 -0500
committerGitHub <noreply@github.com>2016-09-03 09:52:15 -0500
commita08ed826b11dc2fa4d481d66d5041b26ab1320f3 (patch)
tree3956eabdd0167176c8a39bb01a6b4eb9d8b4ad79
parent3dbbfd8db5c21c603620bebc98e03bc84334f11c (diff)
parentbbee747c4d53232e5e12a56cc22d7e2365a9d162 (diff)
downloadnumpy-a08ed826b11dc2fa4d481d66d5041b26ab1320f3.tar.gz
Merge pull request #7956 from rgommers/numpysetup
BLD: remove __NUMPY_SETUP__ from builtins at end of setup.py
-rwxr-xr-xsetup.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 981746ff9..664992451 100755
--- a/setup.py
+++ b/setup.py
@@ -388,3 +388,8 @@ def setup_package():
if __name__ == '__main__':
setup_package()
+ # This may avoid problems where numpy is installed via ``*_requires`` by
+ # setuptools, the global namespace isn't reset properly, and then numpy is
+ # imported later (which will then fail to load numpy extension modules).
+ # See gh-7956 for details
+ del builtins.__NUMPY_SETUP__