From 867835570877c80f9e1a0edec59ee1cd0d6deefa Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 25 Aug 2021 18:20: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. The build that created this CL was https://ci.chromium.org/b/8837903894378605121 recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+log/c02835e8f5cffde254e2774ee9fe8c5da3c93b4a~..9bbda986e31c110bf623e3353f40df3074ea3bab c02835e (yiwzhang@google.com) Reland "py3: stop using deprecated file open mode" 9bbda98 (yiwzhang@google.com) py3: make json module python3 compatible 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: Id0411facb930628b4f9a19eaaa8761e41855aa14 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3119268 Commit-Queue: Recipe Roller Bot-Commit: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++++++++++++-------------------- recipes/recipes.py | 3 ++- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 9dfae94342..71555f6367 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "b8c987380b7767f2a8a4edc02d774f3bce6221a1", + "revision": "9bbda986e31c110bf623e3353f40df3074ea3bab", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 70ccfec13c..3e275dc5b4 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1162,23 +1162,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/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b8c987380b7767f2a8a4edc02d774f3bce6221a1/recipe_engine/recipe_api.py#881 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9bbda986e31c110bf623e3353f40df3074ea3bab/recipe_engine/recipe_api.py#881 diff --git a/recipes/recipes.py b/recipes/recipes.py index 769a11c94f..8224c13062 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -33,6 +33,7 @@ import subprocess import sys from collections import namedtuple +from io import open # pylint: disable=redefined-builtin try: import urllib.parse as urlparse @@ -70,7 +71,7 @@ def parse(repo_root, recipes_cfg_path): current repo (i.e. the folder containing `recipes/` and/or `recipe_modules`) """ - with open(recipes_cfg_path, 'rU') as fh: + with open(recipes_cfg_path, 'r') as fh: pb = json.load(fh) try: