Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: recipes.py

Issue 2520493003: Vendor virtualenv, update to 15.1.0. (Closed)
Patch Set: Fix cache directory usage, now hermetic w/ deps-dir. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bootstrap/virtualenv/virtualenv_support/wheel-0.29.0-py2.py3-none-any.whl ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipes.py
diff --git a/recipes.py b/recipes.py
index e673ed71059c667d9e6ca475060f6e9be409c9c3..fbb6d878526f0dc6287d9b85d6d312dd1d00d1ca 100755
--- a/recipes.py
+++ b/recipes.py
@@ -327,7 +327,7 @@ def doc(package_deps, args):
def info(args):
from recipe_engine import package
- repo_root, config_file = get_package_config(args)
+ _, config_file = get_package_config(args)
package_spec = package.PackageSpec.load_proto(config_file)
if args.recipes_dir:
@@ -589,10 +589,13 @@ def main():
# Propagate our deps path, if specified, so we re-use our temporary
# directory.
if args.deps_path:
- env_path = os.path.join(args.deps_path, '.ENV')
+ venv_root = os.path.join(args.deps_path, '.virtualenv')
+ env_path = os.path.join(venv_root, 'ENV')
+ bootstrap_cache_path = os.path.join(venv_root, 'bootstrap_cache')
os.environ['RECIPES_RUN_BOOTSTRAP_DEPS_DIR'] = args.deps_path
else:
env_path = os.path.join(ROOT_DIR, 'ENV')
+ bootstrap_cache_path = os.path.join(ROOT_DIR, '.bootstrap_cache')
logging.debug('Installing bootstrap environment into: %s', env_path)
subprocess.check_call(
@@ -600,6 +603,7 @@ def main():
sys.executable,
os.path.join(ROOT_DIR, 'bootstrap', 'bootstrap.py'),
'--deps-file', os.path.join(ROOT_DIR, 'bootstrap', 'deps.pyl'),
+ '--cache-root', bootstrap_cache_path,
env_path,
],
cwd=ROOT_DIR)
« no previous file with comments | « bootstrap/virtualenv/virtualenv_support/wheel-0.29.0-py2.py3-none-any.whl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698