mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Use one Python virtual environment for all mach commands
Prior to this commit: * Our Python dependency story was a bit of a mess. We had complete Python packages (wheels and directories) living in-tree, despite not having any changes from upstream. This is particularly bad because `setup.py` never gets run on these packages which could (sometimes silently) unintended breakage. * Python virtual environments (virtualenv) were only utilized for testing web-platform tests After this commit: * A single virtualenv (`python/_virtualenv`) is activated upon *every* call to mach * A requirements file (`python/requirements.txt`) is added to describe the dependencies needed by Python modules in `python/`. The child commit immediately following this will remove all the dependencies no longer needed in-tree (for the sake of keeping this commit readable). Relevant to https://github.com/servo/servo/issues/861 Fixes https://github.com/servo/servo/issues/6999
This commit is contained in:
parent
b91320cb05
commit
33f78314d9
5 changed files with 51 additions and 51 deletions
|
@ -6,7 +6,9 @@ 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",
|
||||
|
@ -73,6 +75,39 @@ 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)
|
||||
|
||||
|
@ -84,6 +119,8 @@ 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue