diff --git a/infra/README.recipes.md b/infra/README.recipes.md index 8b755c2c46..72fe69c22c 100644 --- a/infra/README.recipes.md +++ b/infra/README.recipes.md @@ -174,19 +174,19 @@ This recipe requires ambient luci authentication. To test locally run: — **def [RunSteps](/infra/recipes/update_chromeos_merges.py#14)(api):** -[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-bot_update -[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-depot_tools -[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-gclient -[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-git -[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-gsutil -[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/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-context -[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/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/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-step -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/recipe_engine/recipe_api.py#886 +[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-bot_update +[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-depot_tools +[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-gclient +[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-git +[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-gsutil +[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/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-context +[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/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/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-step +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/recipe_engine/recipe_api.py#886 diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 9e6f487905..e8c6d2ae55 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -20,12 +20,12 @@ "deps": { "depot_tools": { "branch": "refs/heads/main", - "revision": "c83abb3247532d8e80d7ec7e8478a924b73d58c6", + "revision": "89de8f642c99096770ae8f1ddeaa1aa03e59be07", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "recipe_engine": { "branch": "refs/heads/main", - "revision": "7f9b133838f1240a537916677161afd8129b234f", + "revision": "b60bb0d221df01a41a175daf18632ec0525f20f1", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/infra/recipes.py b/infra/recipes.py index 24e4a662e2..cccaaf3e1d 100755 --- a/infra/recipes.py +++ b/infra/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)