mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Fixes #26 (no prepending slash in url to filename path conversion) and #36 (look for bin/python.exe which is used by buildout)
This commit is contained in:
parent
5c0d9fa07a
commit
9cda71e136
|
@ -28,6 +28,8 @@ hg tip
|
||||||
* Adds ``-s`` option to allow the access to the global site-packages if a
|
* Adds ``-s`` option to allow the access to the global site-packages if a
|
||||||
virtualenv is to be created.
|
virtualenv is to be created.
|
||||||
|
|
||||||
|
* Fixed support for Subversion 1.6.
|
||||||
|
|
||||||
0.3.1
|
0.3.1
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
|
5
pip.py
5
pip.py
|
@ -992,6 +992,9 @@ def restart_in_venv(venv, site_packages, args):
|
||||||
virtualenv.create_environment(venv, site_packages=site_packages)
|
virtualenv.create_environment(venv, site_packages=site_packages)
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
python = os.path.join(venv, 'Scripts', 'python.exe')
|
python = os.path.join(venv, 'Scripts', 'python.exe')
|
||||||
|
# check for bin directory which is used in buildouts
|
||||||
|
if not os.path.exists(python):
|
||||||
|
python = os.path.join(venv, 'bin', 'python.exe')
|
||||||
else:
|
else:
|
||||||
python = os.path.join(venv, 'bin', 'python')
|
python = os.path.join(venv, 'bin', 'python')
|
||||||
if not os.path.exists(python):
|
if not os.path.exists(python):
|
||||||
|
@ -3828,7 +3831,7 @@ def is_filename(name):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
_drive_re = re.compile('^([a-z]):', re.I)
|
_drive_re = re.compile('^([a-z]):', re.I)
|
||||||
_url_drive_re = re.compile('^([a-z])[|]', re.I)
|
_url_drive_re = re.compile('^([a-z])[:|]', re.I)
|
||||||
|
|
||||||
def filename_to_url(filename):
|
def filename_to_url(filename):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue