diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-09-06 19:56:50 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-09-06 19:56:50 +0000 |
| commit | 7d8ac102b900a1934c9d710b1eea59beb7945f0e (patch) | |
| tree | 38557117bdffe4ce50e9ed94ef554d1b25a04e22 | |
| parent | fb472900270ef7d949f99c0c7fa42de9d3d18278 (diff) | |
| download | external_python_setuptools-7d8ac102b900a1934c9d710b1eea59beb7945f0e.tar.gz external_python_setuptools-7d8ac102b900a1934c9d710b1eea59beb7945f0e.tar.bz2 external_python_setuptools-7d8ac102b900a1934c9d710b1eea59beb7945f0e.zip | |
Make "setup.py develop" of a setuptools-using project install
setuptools, if needed, instead of only downloading the egg.
(backport from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4051784
| -rwxr-xr-x | setuptools.txt | 3 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/setuptools.txt b/setuptools.txt index 42e81d32..f32f6b46 100755 --- a/setuptools.txt +++ b/setuptools.txt @@ -2568,6 +2568,9 @@ Release Notes/Change History its installation location) when a script requests a version that's not available. + * Running ``setup.py develop`` on a setuptools-using project will now install + setuptools if needed, instead of only downloading the egg. + 0.6c1 * Fixed ``AttributeError`` when trying to download a ``setup_requires`` dependency when a distribution lacks a ``dependency_links`` setting. diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index 49b5b3ac..0c20dd8d 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -51,7 +51,6 @@ class develop(easy_install): self.egg_link = os.path.join(self.install_dir, ei.egg_name+'.egg-link') self.egg_base = ei.egg_base self.egg_path = os.path.abspath(ei.egg_base) - # Make a distribution for the package's source self.dist = Distribution( normalize_path(self.egg_path), @@ -62,12 +61,13 @@ class develop(easy_install): def install_for_development(self): # Ensure metadata is up-to-date self.run_command('egg_info') - # Build extensions in-place self.reinitialize_command('build_ext', inplace=1) self.run_command('build_ext') - self.install_site_py() # ensure that target dir is site-safe + if setuptools.bootstrap_install_from: + self.easy_install(setuptools.bootstrap_install_from) + setuptools.bootstrap_install_from = None # create an .egg-link in the installation dir, pointing to our egg log.info("Creating %s (link to %s)", self.egg_link, self.egg_base) |