From 8ac2b6422671d16f39765c4c460ef80b6ad9f500 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 12 May 2021 10:22:41 +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. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+log/955bddfc919a5f22042d9f001e6f751dd89b3401~..dc36545f92232c37f4af4080296258fc1e240258 955bddf (olivernewman@google.com) Do trivial s/master/main substitutions 2200d7d (bryner@google.com) Upgrade cffi to 1.14.5 for the recipe engine. dc36545 (iannucci@chromium.org) [python3] Add test and do futurize --stage1. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=iannucci@chromium.org, tandrii@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Icc1683726c3db84472f77333f6f6b9024f07dab3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2891350 Commit-Queue: Recipe Roller Bot-Commit: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++++++++++++-------------------- recipes/recipes.py | 6 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 05893e502a..2c9dd6b4de 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "f4c9a77634665e42da92a9d7005ec920a3e38c9e", + "revision": "dc36545f92232c37f4af4080296258fc1e240258", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 143bf772da..8883c5d0a1 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1102,23 +1102,23 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/recipe_engine/recipe_api.py#875 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/dc36545f92232c37f4af4080296258fc1e240258/recipe_engine/recipe_api.py#875 diff --git a/recipes/recipes.py b/recipes/recipes.py index 9804a4c320..90c522250f 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -19,7 +19,7 @@ ** DO NOT MODIFY ** ******************* -This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/master/recipes.py. +This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/main/recipes.py. To fix bugs, fix in the googlesource repo then run the autoroller. """ @@ -44,7 +44,7 @@ except ImportError: # url (str) - the url to the engine repo we want to use. # revision (str) - the git revision for the engine to get. # branch (str) - the branch to fetch for the engine as an absolute ref (e.g. -# refs/heads/master) +# refs/heads/main) EngineDep = namedtuple('EngineDep', 'url revision branch') @@ -94,7 +94,7 @@ def parse(repo_root, recipes_cfg_path): recipes_cfg_path) engine.setdefault('revision', '') - engine.setdefault('branch', 'refs/heads/master') + engine.setdefault('branch', 'refs/heads/main') recipes_path = pb.get('recipes_path', '') # TODO(iannucci): only support absolute refs