[Python-checkins] r51784 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/develop.py

Wed Sep 6 21:56:51 CEST 2006

Author: phillip.eby
Date: Wed Sep 6 21:56:50 2006
New Revision: 51784
Modified:
 sandbox/branches/setuptools-0.6/setuptools.txt
 sandbox/branches/setuptools-0.6/setuptools/command/develop.py
Log:
Make "setup.py develop" of a setuptools-using project install
setuptools, if needed, instead of only downloading the egg.
(backport from trunk)
Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================

--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Wed Sep 6 21:56:50 2006
@@ -2568,6 +2568,9 @@
 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.
Modified: sandbox/branches/setuptools-0.6/setuptools/command/develop.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/develop.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/develop.py	Wed Sep 6 21:56:50 2006
@@ -51,7 +51,6 @@
 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 @@
 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)
