aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll recipe dependencies (trivial).

Browse Source 
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

The build that created this CL was
https://ci.chromium.org/b/8749199400695858417

recipe_engine:
c406446548
  c406446 (iannucci@chromium.org)
      [recipes.py] Directly set PYTHONPATH to the engine path.

Please check the following references for more information:
- autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller
- rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback
- cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md

Use https://goo.gl/noib3a to file a bug.

R=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Ignore-Freeze: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ic30c50358ba53681b69e120c3660d1ad667390ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5503093
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Bot-Commit: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
changes/93/5503093/2
recipe-roller 10 months ago committed by LUCI CQ
parent 765b75b4c0
commit bd68c9d2aa
3 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
infra/config/recipes.cfg
Unescape Escape View File

@ -17,7 +17,7 @@
"deps": {
"recipe_engine": {
"branch": "refs/heads/main",
"revision": "eb434718b27659fb36792b710cf2b80b8d85aa0b",
"revision": "c406446548974dc887dac0a676838e08e09b526a",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},

46
recipes/README.recipes.md
Unescape Escape View File

@ -1212,26 +1212,26 @@ Move things around in a loop!
&mdash; **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#16)(api):**
[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-archive
[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-assertions
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-commit_position
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-cq
[recipe_engine/recipe_modules/cv]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-cv
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-led
[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-milo
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-resultdb
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-time
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-url
[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/README.recipes.md#recipe_modules-version
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eb434718b27659fb36792b710cf2b80b8d85aa0b/recipe_engine/recipe_api.py#433
[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-archive
[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-assertions
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-commit_position
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-cq
[recipe_engine/recipe_modules/cv]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-cv
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-led
[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-milo
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-resultdb
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-time
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-url
[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/README.recipes.md#recipe_modules-version
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c406446548974dc887dac0a676838e08e09b526a/recipe_engine/recipe_api.py#433

11
recipes/recipes.py
Unescape Escape View File

@ -235,13 +235,10 @@ def main():
if not shutil.which(vpython):
return f'Required binary is not found on PATH: {vpython}'
# We unset PYTHONPATH here in case the user has conflicting environmental
# things we don't want them to leak through into the recipe_engine which
# manages its environment entirely via vpython.
#
# NOTE: os.unsetenv unhelpfully doesn't exist on all platforms until python3.9
# so we have to use the cutesy `pop` formulation below until then...
os.environ.pop("PYTHONPATH", None)
# We overwrite PYTHONPATH here on purpose; We don't want any conflicting
# environmental path leaking through into the recipe_engine which manages its
# environment entirely via vpython.
os.environ['PYTHONPATH'] = engine_path
spec = '.vpython3'
debugger = os.environ.get('RECIPE_DEBUGGER', '')

Write Preview
Loading…
Cancel
Save