aboutsummaryrefslogtreecommitdiffstats
path: root/python/mach_bootstrap.py
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2015-08-09 11:20:40 +0200
committerMs2ger <Ms2ger@gmail.com>2015-08-09 11:20:40 +0200
commit47d6d958f58f5011742a18abcdd5a76bf4390966 (patch)
treee4d041afeeb75e0f3d424da8cdbac0026bd5de8c /python/mach_bootstrap.py
parentc315404db80c92a695531b0aa4bcf61c125a3bff (diff)
downloadservo-47d6d958f58f5011742a18abcdd5a76bf4390966.tar.gz
servo-47d6d958f58f5011742a18abcdd5a76bf4390966.zip
Revert "Auto merge of #7103 - frewsxcv:python-venv, r=metajack" for breaking web-platform-tests.
This reverts commit c315404db80c92a695531b0aa4bcf61c125a3bff, reversing changes made to b00583bd4e7169a6b952633df718268904f2bd0c.
Diffstat (limited to 'python/mach_bootstrap.py')
-rw-r--r--python/mach_bootstrap.py37
1 files changed, 0 insertions, 37 deletions
diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py
index e04d1781bdd..84de5b22b25 100644
--- a/python/mach_bootstrap.py
+++ b/python/mach_bootstrap.py
@@ -6,9 +6,7 @@ from __future__ import print_function, unicode_literals
import os
import platform
-import subprocess
import sys
-from distutils.spawn import find_executable
SEARCH_PATHS = [
"python/mach",
@@ -75,39 +73,6 @@ CATEGORIES = {
}
-def _get_exec(name, default=None):
- path = find_executable(name)
- if not path:
- return default
- return path
-
-
-def _activate_virtualenv(topdir):
- virtualenv_path = os.path.join(topdir, "python", "_virtualenv")
- python = _get_exec("python2", "python")
-
- if not os.path.exists(virtualenv_path):
- virtualenv = _get_exec("virtualenv2", "virtualenv")
- subprocess.check_call([virtualenv, "-p", python, virtualenv_path])
-
- activate_path = os.path.join(virtualenv_path, "bin", "activate_this.py")
- execfile(activate_path, dict(__file__=activate_path))
-
- # TODO: Right now, we iteratively install all the requirements by invoking
- # `pip install` each time. If it were the case that there were conflicting
- # requirements, we wouldn't know about them. Once
- # https://github.com/pypa/pip/issues/988 is addressed, then we can just
- # chain each of the requirements files into the same `pip install` call
- # and it will check for conflicts.
- requirements_paths = [
- os.path.join(topdir, "python", "requirements.txt"),
- os.path.join(topdir, "tests", "wpt", "harness", "requirements.txt"),
- os.path.join(topdir, "tests", "wpt", "harness", "requirements_servo.txt"),
- ]
- for path in requirements_paths:
- subprocess.check_call(["pip", "install", "-q", "-r", path])
-
-
def bootstrap(topdir):
topdir = os.path.abspath(topdir)
@@ -119,8 +84,6 @@ def bootstrap(topdir):
print('You are running Python', platform.python_version())
sys.exit(1)
- _activate_virtualenv(topdir)
-
def populate_context(context, key=None):
if key is None:
return