summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2006-01-31 23:20:47 +0000
committercookedm <cookedm@localhost>2006-01-31 23:20:47 +0000
commit26188dcc2f6b28f53f87151f58c7e60a404879dd (patch)
tree1e6ecc98bd905a00a6c4186bbcfe2c7743993e74
parent042a315ef2bf081067b4ed93ac7994016936653b (diff)
downloadnumpy-26188dcc2f6b28f53f87151f58c7e60a404879dd.tar.gz
When using setuptools, run the build_src command before egg_info (which is run by the bdist_egg command).
This means that python -c 'import setuptools; execfile("setup.py")' bdist_egg works fine, without having to add build_src in there.
-rw-r--r--numpy/distutils/command/egg_info.py6
-rw-r--r--numpy/distutils/core.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/numpy/distutils/command/egg_info.py b/numpy/distutils/command/egg_info.py
new file mode 100644
index 000000000..d2f07e28f
--- /dev/null
+++ b/numpy/distutils/command/egg_info.py
@@ -0,0 +1,6 @@
+from setuptools.command.egg_info import egg_info as _egg_info
+
+class egg_info(_egg_info):
+ def run(self):
+ self.run_command("build_src")
+ _egg_info.run(self)
diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py
index 3a1722179..8310e2a52 100644
--- a/numpy/distutils/core.py
+++ b/numpy/distutils/core.py
@@ -40,7 +40,8 @@ numpy_cmdclass = {'build': build.build,
'bdist_rpm': bdist_rpm.bdist_rpm,
}
if have_setuptools:
- from setuptools.command import bdist_egg, develop, easy_install, egg_info
+ from setuptools.command import bdist_egg, develop, easy_install
+ from numpy.distutils.command import egg_info
numpy_cmdclass['bdist_egg'] = bdist_egg.bdist_egg
numpy_cmdclass['develop'] = develop.develop
numpy_cmdclass['easy_install'] = easy_install.easy_install