From 60cf2d31c8edb39b418f522ad935320c6da9c927 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Sat, 19 Jan 2008 02:55:03 +0000 Subject: Fix interactions between the various "require" options, so that downloads aren't repeated and needed eggs are always installed, even if they were downloaded to the setup directory already. (backport from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4060066 --- setuptools/command/develop.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'setuptools/command/develop.py') diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index dfc41764..f128b803 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -3,7 +3,7 @@ from distutils.util import convert_path from pkg_resources import Distribution, PathMetadata, normalize_path from distutils import log from distutils.errors import * -import sys, os, setuptools +import sys, os, setuptools, glob class develop(easy_install): """Set up package for development""" @@ -32,7 +32,7 @@ class develop(easy_install): self.egg_path = None easy_install.initialize_options(self) self.setup_path = None - + self.always_copy_from = '.' # always copy eggs installed in curdir @@ -48,9 +48,11 @@ class develop(easy_install): ) self.args = [ei.egg_name] easy_install.finalize_options(self) + # pick up setup-dir .egg files only: no .egg-info + self.package_index.scan(glob.glob('*.egg')) + self.egg_link = os.path.join(self.install_dir, ei.egg_name+'.egg-link') self.egg_base = ei.egg_base - if self.egg_path is None: self.egg_path = os.path.abspath(ei.egg_base) @@ -60,7 +62,6 @@ class develop(easy_install): "--egg-path must be a relative path from the install" " directory to "+target ) - # Make a distribution for the package's source self.dist = Distribution( @@ -79,7 +80,6 @@ class develop(easy_install): "Can't get a consistent path to setup script from" " installation directory", p, normalize_path(os.curdir)) - def install_for_development(self): # Ensure metadata is up-to-date self.run_command('egg_info') -- cgit v1.2.3