New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ensure virtualenv activates #10618
Ensure virtualenv activates #10618
Changes from all commits
File filter...
Jump to…
| @@ -9,7 +9,6 @@ | ||
| import subprocess | ||
| import sys | ||
| from distutils.spawn import find_executable | ||
| from pipes import quote | ||
|
|
||
| SEARCH_PATHS = [ | ||
| os.path.join("python", "mach"), | ||
| @@ -111,7 +110,11 @@ def _activate_virtualenv(topdir): | ||
| except (subprocess.CalledProcessError, OSError): | ||
| sys.exit("Python virtualenv failed to execute properly.") | ||
|
|
||
| execfile(activate_path, dict(__file__=quote(activate_path))) | ||
| execfile(activate_path, dict(__file__=activate_path)) | ||
jdm
Member
|
||
|
|
||
| python = find_executable("python") | ||
| if python is None or not python.startswith(virtualenv_path): | ||
| sys.exit("Python virtualenv failed to activate.") | ||
zwn
Author
Contributor
|
||
|
|
||
| # TODO: Right now, we iteratively install all the requirements by invoking | ||
| # `pip install` each time. If it were the case that there were conflicting | ||
Someone should check to see if this breaks Linux/OSX paths with spaces