commit d4786805a4f842dc29abc39bb32f02150c10a547
author Rob Mohr <mohrr@google.com> Fri Nov 06 14:05:22 2020 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Nov 07 00:19:09 2020 +0000
tree d217f528a982ec2af6844eef3ea85b597889e209
parent 8e4e030f9b5355ae5c3acc10b440dc5e90116de3

pw_env_setup: Add target packages to bootstrap

Change-Id: I002751e74535f759f5d3834795333e0ef7b3b6d0
Bug: 287
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/23900
Commit-Queue: Keir Mierle <keir@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index a7fdd5f..6f0c63b 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -89,7 +89,7 @@
 if [ "$(basename "$_BOOTSTRAP_PATH")" = "bootstrap.sh" ] || \
   [ ! -f "$SETUP_SH" ] || \
   [ ! -s "$SETUP_SH" ]; then
-  pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --use-pigweed-defaults --json-file "$_PW_ACTUAL_ENVIRONMENT_ROOT/actions.json"
+  pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --use-pigweed-defaults --json-file "$_PW_ACTUAL_ENVIRONMENT_ROOT/actions.json" --virtualenv-gn-target "$PW_ROOT#:target_support_packages.install"
   pw_finalize bootstrap "$SETUP_SH"
 else
   pw_activate

pw_presubmit/py/pw_presubmit/pigweed_presubmit.py

diff --git a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
index 6c81db0..fdbd072 100755
--- a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
+++ b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
@@ -48,7 +48,14 @@
 
 
 def init_virtualenv(ctx: PresubmitContext):
-    environment.init_virtualenv(ctx.root, ctx.output_dir)
+    environment.init_virtualenv(
+        ctx.root,
+        ctx.output_dir,
+        gn_targets=(
+            f'{ctx.root}#:python.install',
+            f'{ctx.root}#:target_support_packages.install',
+        ),
+    )
 
 
 # Trigger builds if files with these extensions change.