[Python-checkins] r42681 - in sandbox/trunk/setuptools/setuptools: command/easy_install.py dist.py

[phillip.eby]

Author: phillip.eby
Date: Tue Feb 28 21:59:27 2006
New Revision: 42681

Modified:
   sandbox/trunk/setuptools/setuptools/command/easy_install.py
   sandbox/trunk/setuptools/setuptools/dist.py
Log:
When installing setup_requires/tests_require packages, use 
--multi-version so that '.' doesn't have to support .pth files.


Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/easy_install.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/easy_install.py	Tue Feb 28 21:59:27 2006
@@ -363,8 +363,8 @@
                 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):

Modified: sandbox/trunk/setuptools/setuptools/dist.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/dist.py	(original)
+++ sandbox/trunk/setuptools/setuptools/dist.py	Tue Feb 28 21:59:27 2006
@@ -267,7 +267,7 @@
                 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