From 89de8f642c99096770ae8f1ddeaa1aa03e59be07 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Thu, 25 May 2023 19:21:07 +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/8780099256731961841 recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1 b60bb0d (nmulcahey@google.com) Revert "[recipes.py] Unset PYTHONPATH in case users have confli... 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: I337c7a41a9986e96d70d95219bfa26c6996e768f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4568804 Bot-Commit: Recipe Roller Commit-Queue: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 42 +++++++++++++++++++-------------------- recipes/recipes.py | 5 ----- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 280ebd106..363720dde 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "7f9b133838f1240a537916677161afd8129b234f", + "revision": "b60bb0d221df01a41a175daf18632ec0525f20f1", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 8499af8b8..e3106d9b1 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/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-led -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-time -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/recipe_engine/recipe_api.py#886 +[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 diff --git a/recipes/recipes.py b/recipes/recipes.py index 24e4a662e..cccaaf3e1 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -235,11 +235,6 @@ 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. - os.unsetenv("PYTHONPATH") - argv = ([ vpython, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py'), ] + args)