From 05ab73be51774f098eb580eda6e96a49e1010b1b Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 31 May 2023 00:22:28 +0000 Subject: [PATCH] Roll recipe dependencies (trivial). 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/8779627399360428833 recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580 8fc4e6c (iannucci@chromium.org) [recipes.py] Unset PYTHONPATH in case users have conflicting va... 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: Ic44889da71a3d866194f471046b769c075f13e15 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4575879 Commit-Queue: Recipe Roller Bot-Commit: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 42 +++++++++++++++++++-------------------- recipes/recipes.py | 8 ++++++++ 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 363720dde..43929483f 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "b60bb0d221df01a41a175daf18632ec0525f20f1", + "revision": "8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index e3106d9b1..ac3dce88b 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1182,24 +1182,24 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#16)(api):** -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-led -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-time -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/recipe_engine/recipe_api.py#886 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-led +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-time +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8fc4e6c80e522c4bdcc2b04676c3eb5bde9a1580/recipe_engine/recipe_api.py#886 diff --git a/recipes/recipes.py b/recipes/recipes.py index cccaaf3e1..5f23b3fab 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -235,6 +235,14 @@ 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) + argv = ([ vpython, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py'), ] + args)