diff options
author | PJ Eby <distutils-sig@python.org> | 2005-08-06 19:29:49 +0000 |
---|---|---|
committer | PJ Eby <distutils-sig@python.org> | 2005-08-06 19:29:49 +0000 |
commit | 8afe820f59c3b63795bd235f2800b0e1329eb7e1 (patch) | |
tree | a1d513446260cf010850a1a1e52a7d1815bb40a2 /setuptools/command/install.py | |
parent | 8a29467d941a7983d5f6eadc5c0e1624417944b6 (diff) | |
download | external_python_setuptools-8afe820f59c3b63795bd235f2800b0e1329eb7e1.tar.gz external_python_setuptools-8afe820f59c3b63795bd235f2800b0e1329eb7e1.tar.bz2 external_python_setuptools-8afe820f59c3b63795bd235f2800b0e1329eb7e1.zip |
Got rid of the no-longer meaningful "depends" command. Consolidated the
replacement of the "install" command so that installation is always via
easy_install, but doesn't use the previous kludgy intereception technique.
Allow ``extra_path`` to be set, but ignore it, so that when easy_install
wraps a package that uses it, there won't be any confusion as to the
desired installation location.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041181
Diffstat (limited to 'setuptools/command/install.py')
-rw-r--r-- | setuptools/command/install.py | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/setuptools/command/install.py b/setuptools/command/install.py index 86f0cb7b..acbe8ade 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py @@ -1,9 +1,31 @@ +import setuptools from distutils.command.install import install as _install class install(_install): """Build dependencies before installation""" - def has_dependencies(self): - return self.distribution.has_dependencies() + def handle_extra_path(self): + # We always ignore extra_path, because we always install eggs + # (you can always use install_* commands directly if needed) + self.path_file = None + self.extra_dirs = '' + + def run(self): + from setuptools.command.easy_install import easy_install + cmd = easy_install( + self.distribution, args="x", ignore_conflicts_at_my_risk=1 + ) + cmd.ensure_finalized() # finalize before bdist_egg munges install cmd + + self.run_command('bdist_egg') + args = [self.distribution.get_command_obj('bdist_egg').egg_output] + + if setuptools.bootstrap_install_from: + # Bootstrap self-installation of setuptools + args.insert(0, setuptools.bootstrap_install_from) + + cmd.args = args + cmd.run() + setuptools.bootstrap_install_from = None + - sub_commands = [('depends', has_dependencies)] + _install.sub_commands |