corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1739067: Scope Mach virtualenv to be checkout-specific r=perftest-reviewers,ahal,sparky

Browse Source 
Build and run the Mach virtualenv from a `state_dir` that is
"specific-to-topsrcdir".

As part of this, move `get_state_dir()` to `mach` so that it's usable
before `sys.path` entries are fully set up.

Differential Revision: https://phabricator.services.mozilla.com/D130383
This commit is contained in:
Mitchell Hentges
2021-11-29 22:33:54 +00:00
parent 01b56a2f66
commit 4346b60dc0
22 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
build/mach_initialize.py
View File

@@ -167,18 +167,6 @@ install a recent enough Python 3.
def _activate_python_environment(topsrcdir, state_dir):
# We need the "mach" module to access the logic to activate the top-level
# Mach site. Since that depends on "packaging" (and, transitively,
# "pyparsing"), we add those to the path too.
sys.path[0:0] = [
os.path.join(topsrcdir, module)
for module in (
os.path.join("python", "mach"),
os.path.join("third_party", "python", "packaging"),
os.path.join("third_party", "python", "pyparsing"),
)
]
from mach.site import MachSiteManager
mach_environment = MachSiteManager.from_environment(
@@ -212,13 +200,25 @@ def initialize(topsrcdir):
if os.path.exists(deleted_dir):
shutil.rmtree(deleted_dir, ignore_errors=True)
# We need the "mach" module to access the logic to parse virtualenv
# requirements. Since that depends on "packaging" (and, transitively,
# "pyparsing"), we add those to the path too.
sys.path[0:0] = [
os.path.join(topsrcdir, module)
for module in (
os.path.join("python", "mach"),
os.path.join("third_party", "python", "packaging"),
os.path.join("third_party", "python", "pyparsing"),
)
]
from mach.util import setenv, get_state_dir
state_dir = _create_state_dir()
_activate_python_environment(topsrcdir, state_dir)
_activate_python_environment(topsrcdir, get_state_dir(True, topsrcdir=topsrcdir))
import mach.base
import mach.main
from mach.util import setenv
from mozboot.util import get_state_dir
# Set a reasonable limit to the number of open files.
#
@@ -322,7 +322,7 @@ def initialize(topsrcdir):
return state_dir
if key == "local_state_dir":
return get_state_dir(srcdir=True)
return get_state_dir(specific_to_topsrcdir=True)
if key == "topdir":
return topsrcdir