diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-02-28 20:59:27 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-02-28 20:59:27 +0000 |
| commit | 0e3d174d58cba20737bbb8fa4184755dd17c4b83 (patch) | |
| tree | dc56f42f9482b60c9ef1fe4724dfbc173c0ce7a9 | |
| parent | 7c9b80ed90ea760e026d634c5ad1fbc6eb62cb0d (diff) | |
| download | external_python_setuptools-0e3d174d58cba20737bbb8fa4184755dd17c4b83.tar.gz external_python_setuptools-0e3d174d58cba20737bbb8fa4184755dd17c4b83.tar.bz2 external_python_setuptools-0e3d174d58cba20737bbb8fa4184755dd17c4b83.zip | |
When installing setup_requires/tests_require packages, use
--multi-version so that '.' doesn't have to support .pth files.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4042681
| -rwxr-xr-x | setuptools/command/easy_install.py | 4 | ||||
| -rw-r--r-- | setuptools/dist.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 2287c1b7..b79b0d51 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -363,8 +363,8 @@ Please make the appropriate changes for your system and try again. if f: f.close() if os.path.exists(ok_file): os.unlink(ok_file) if os.path.exists(pth_file): os.unlink(pth_file) - - log.warn("TEST FAILED: %s does NOT support .pth files", instdir) + if not self.multi_version: + log.warn("TEST FAILED: %s does NOT support .pth files", instdir) return False def install_egg_scripts(self, dist): diff --git a/setuptools/dist.py b/setuptools/dist.py index 273ffe00..d906eb72 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -267,7 +267,7 @@ class Distribution(_Distribution): self.__class__({'script_args':['easy_install']}), args="x", install_dir=os.curdir, exclude_scripts=True, always_copy=False, build_directory=None, editable=False, - upgrade=False + upgrade=False, multi_version=True ) cmd.ensure_finalized() cmd.zip_ok = None # override any setup.cfg setting for these |