diff options
| -rw-r--r-- | numpy/distutils/command/build_scripts.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/command/develop.py | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index 1217a2c1f..99134f202 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -37,6 +37,10 @@ class build_scripts(old_build_scripts): return self.scripts = self.generate_scripts(self.scripts) + # Now make sure that the distribution object has this list of scripts. + # setuptools' develop command requires that this be a list of filenames, + # not functions. + self.distribution.scripts = self.scripts return old_build_scripts.run(self) diff --git a/numpy/distutils/command/develop.py b/numpy/distutils/command/develop.py index dddf03be6..167706671 100644 --- a/numpy/distutils/command/develop.py +++ b/numpy/distutils/command/develop.py @@ -1,5 +1,6 @@ -""" Override the develop command from setuptools so we can ensure that build_src ---inplace gets executed. +""" Override the develop command from setuptools so we can ensure that our +generated files (from build_src or build_scripts) are properly converted to real +files with filenames. """ from setuptools.command.develop import develop as old_develop @@ -9,4 +10,6 @@ class develop(old_develop): def install_for_development(self): # Build sources in-place, too. self.reinitialize_command('build_src', inplace=1) + # Make sure scripts are built. + self.run_command('build_scripts') old_develop.install_for_development(self) |