From 4a9d989f52e9be9f50b3af38d02b51e63350bd05 Mon Sep 17 00:00:00 2001 From: Vadim Shtayura Date: Fri, 29 Mar 2024 20:49:12 +0000 Subject: [PATCH] Roll recipe dependencies. To pick up https://chromium.googlesource.com/infra/luci/recipes-py/+/fcb91e42 R=iannucci@chromium.org Change-Id: I60d77bbdbe1eb92efd05370d45523af7600b7790 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5406117 Reviewed-by: Robbie Iannucci Commit-Queue: Vadim Shtayura --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 48 +++++++++---------- .../tryserver/tests/require_is_tryserver.py | 3 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 301986f67..cfd0a37a9 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -17,7 +17,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "35fbfce2c2af05d073ed77af3125184a124f71c3", + "revision": "fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 2c06faaa6..c3cd5387e 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1201,10 +1201,10 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/tryserver/tests/get_footers.py#19)(api):** ### *recipes* / [tryserver:tests/require\_is\_tryserver](/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py) -[DEPS](/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py#12): [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/properties][recipe_engine/recipe_modules/properties] +[DEPS](/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py#13): [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/properties][recipe_engine/recipe_modules/properties] -— **def [RunSteps](/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py#19)(api):** +— **def [RunSteps](/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py#20)(api):** ### *recipes* / [windows\_sdk:examples/full](/recipes/recipe_modules/windows_sdk/examples/full.py) [DEPS](/recipes/recipe_modules/windows_sdk/examples/full.py#7): [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] @@ -1212,25 +1212,25 @@ Move things around in a loop! — **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/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-archive -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-led -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-time -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/35fbfce2c2af05d073ed77af3125184a124f71c3/recipe_engine/recipe_api.py#471 +[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-archive +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-led +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-time +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcb91e424fe6f14f4f9fc23a748f13b114a8dc1a/recipe_engine/recipe_api.py#471 diff --git a/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py b/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py index 928cbc33d..d5bbe1e47 100644 --- a/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py +++ b/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py @@ -4,7 +4,8 @@ from recipe_engine import post_process -from PB.go.chromium.org.luci.swarming.proto.api import swarming as swarming_pb +from PB.go.chromium.org.luci.swarming.proto.api_v2 import ( + swarming as swarming_pb) from PB.recipe_modules.recipe_engine.led import properties as led_properties_pb PYTHON_VERSION_COMPATIBILITY = 'PY3'