Commit 0e3d174d authored by PJ Eby's avatar PJ Eby

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
parent 7c9b80ed
...@@ -363,8 +363,8 @@ Please make the appropriate changes for your system and try again. ...@@ -363,8 +363,8 @@ Please make the appropriate changes for your system and try again.
if f: f.close() if f: f.close()
if os.path.exists(ok_file): os.unlink(ok_file) if os.path.exists(ok_file): os.unlink(ok_file)
if os.path.exists(pth_file): os.unlink(pth_file) if os.path.exists(pth_file): os.unlink(pth_file)
if not self.multi_version:
log.warn("TEST FAILED: %s does NOT support .pth files", instdir) log.warn("TEST FAILED: %s does NOT support .pth files", instdir)
return False return False
def install_egg_scripts(self, dist): def install_egg_scripts(self, dist):
......
...@@ -267,7 +267,7 @@ class Distribution(_Distribution): ...@@ -267,7 +267,7 @@ class Distribution(_Distribution):
self.__class__({'script_args':['easy_install']}), self.__class__({'script_args':['easy_install']}),
args="x", install_dir=os.curdir, exclude_scripts=True, args="x", install_dir=os.curdir, exclude_scripts=True,
always_copy=False, build_directory=None, editable=False, always_copy=False, build_directory=None, editable=False,
upgrade=False upgrade=False, multi_version=True
) )
cmd.ensure_finalized() cmd.ensure_finalized()
cmd.zip_ok = None # override any setup.cfg setting for these cmd.zip_ok = None # override any setup.cfg setting for these
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment