Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
https://crrev.com/c923df1b4ecf75345768d71a09e0ce17fd21c9aa Autoformat recipes.py with yapf chromium style (olivernewman@google.com)
TBR=martiniss@chromium.org
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I0ff4b7414e1a66f688313f19a63f9645855e7ce5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1625326
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 78758e2..c55fe5b 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -15,12 +15,12 @@
"deps": {
"depot_tools": {
"branch": "master",
- "revision": "7a6143385da466fa4ac8f60a196d21acbacde251",
+ "revision": "515b1546c27fd5f03095d91151f8f928018d4398",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"recipe_engine": {
"branch": "master",
- "revision": "bae937d72f6b21b53a3218efdb0471861a332c0c",
+ "revision": "c923df1b4ecf75345768d71a09e0ce17fd21c9aa",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
diff --git a/scripts/slave/README.recipes.md b/scripts/slave/README.recipes.md
index 2e3b21b..de4fd9d 100644
--- a/scripts/slave/README.recipes.md
+++ b/scripts/slave/README.recipes.md
@@ -5550,41 +5550,41 @@
— **def [RunSteps](/scripts/slave/recipe_modules/zip/examples/full.py#14)(api):**
-[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-bot_update
-[depot_tools/recipe_modules/cipd]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-cipd
-[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-depot_tools
-[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-gclient
-[depot_tools/recipe_modules/gerrit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-gerrit
-[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-git
-[depot_tools/recipe_modules/gitiles]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-gitiles
-[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-gsutil
-[depot_tools/recipe_modules/infra_paths]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-infra_paths
-[depot_tools/recipe_modules/osx_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-osx_sdk
-[depot_tools/recipe_modules/presubmit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-presubmit
-[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-tryserver
-[depot_tools/recipe_modules/windows_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/7a6143385da466fa4ac8f60a196d21acbacde251/recipes/README.recipes.md#recipe_modules-windows_sdk
-[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-assertions
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-commit_position
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-cq
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/generator_script]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-generator_script
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-led
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/scheduler]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-scheduler
-[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-service_account
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-swarming
-[recipe_engine/recipe_modules/tempfile]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-tempfile
-[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-time
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/recipe_engine/recipe_api.py#836
-[recipe_engine/wkt/returns_placeholder]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bae937d72f6b21b53a3218efdb0471861a332c0c/recipe_engine/util.py#135
+[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-bot_update
+[depot_tools/recipe_modules/cipd]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-cipd
+[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-depot_tools
+[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-gclient
+[depot_tools/recipe_modules/gerrit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-gerrit
+[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-git
+[depot_tools/recipe_modules/gitiles]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-gitiles
+[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-gsutil
+[depot_tools/recipe_modules/infra_paths]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-infra_paths
+[depot_tools/recipe_modules/osx_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-osx_sdk
+[depot_tools/recipe_modules/presubmit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-presubmit
+[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-tryserver
+[depot_tools/recipe_modules/windows_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/515b1546c27fd5f03095d91151f8f928018d4398/recipes/README.recipes.md#recipe_modules-windows_sdk
+[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-assertions
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-commit_position
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-cq
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/generator_script]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-generator_script
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-led
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/scheduler]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-scheduler
+[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-service_account
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-swarming
+[recipe_engine/recipe_modules/tempfile]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-tempfile
+[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-time
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/recipe_engine/recipe_api.py#836
+[recipe_engine/wkt/returns_placeholder]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c923df1b4ecf75345768d71a09e0ce17fd21c9aa/recipe_engine/util.py#135
diff --git a/scripts/slave/recipes.py b/scripts/slave/recipes.py
index 6cdc365..c6b37ae 100755
--- a/scripts/slave/recipes.py
+++ b/scripts/slave/recipes.py
@@ -13,7 +13,6 @@
# pylint: disable=pointless-string-statement
''''exec python -u -- "$0" ${1+"$@"} # '''
# vi: syntax=python
-
"""Bootstrap script to clone and forward to the recipe engine tool.
*******************
@@ -41,14 +40,14 @@
# 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)
-EngineDep = namedtuple('EngineDep',
- 'url revision branch')
+EngineDep = namedtuple('EngineDep', 'url revision branch')
class MalformedRecipesCfg(Exception):
+
def __init__(self, msg, path):
- super(MalformedRecipesCfg, self).__init__('malformed recipes.cfg: %s: %r'
- % (msg, path))
+ full_message = 'malformed recipes.cfg: %s: %r' % (msg, path)
+ super(MalformedRecipesCfg, self).__init__(full_message)
def parse(repo_root, recipes_cfg_path):
@@ -86,8 +85,8 @@
if 'url' not in engine:
raise MalformedRecipesCfg(
- 'Required field "url" in dependency "recipe_engine" not found',
- recipes_cfg_path)
+ 'Required field "url" in dependency "recipe_engine" not found',
+ recipes_cfg_path)
engine.setdefault('revision', '')
engine.setdefault('branch', 'refs/heads/master')
@@ -97,8 +96,8 @@
if not engine['branch'].startswith('refs/'):
engine['branch'] = 'refs/heads/' + engine['branch']
- recipes_path = os.path.join(
- repo_root, recipes_path.replace('/', os.path.sep))
+ recipes_path = os.path.join(repo_root,
+ recipes_path.replace('/', os.path.sep))
return EngineDep(**engine), recipes_path
except KeyError as ex:
raise MalformedRecipesCfg(ex.message, recipes_cfg_path)
@@ -114,6 +113,7 @@
def _is_executable(path):
return os.path.isfile(path) and os.access(path, os.X_OK)
+
# TODO: Use shutil.which once we switch to Python3.
def _is_on_path(basename):
for path in os.environ['PATH'].split(os.pathsep):
@@ -129,13 +129,13 @@
def _git_check_call(argv, **kwargs):
- argv = [GIT]+argv
+ argv = [GIT] + argv
logging.info('Running %r', argv)
subprocess.check_call(argv, **kwargs)
def _git_output(argv, **kwargs):
- argv = [GIT]+argv
+ argv = [GIT] + argv
logging.info('Running %r', argv)
return subprocess.check_output(argv, **kwargs)
@@ -181,10 +181,15 @@
_git_check_call(['init', engine_path], stdout=NUL)
try:
- _git_check_call(['rev-parse', '--verify', '%s^{commit}' % revision],
- cwd=engine_path, stdout=NUL, stderr=NUL)
+ _git_check_call(['rev-parse', '--verify',
+ '%s^{commit}' % revision],
+ cwd=engine_path,
+ stdout=NUL,
+ stderr=NUL)
except subprocess.CalledProcessError:
- _git_check_call(['fetch', url, branch], cwd=engine_path, stdout=NUL,
+ _git_check_call(['fetch', url, branch],
+ cwd=engine_path,
+ stdout=NUL,
stderr=NUL)
try:
@@ -213,13 +218,12 @@
if recipes_cfg_path:
# calculate repo_root from recipes_cfg_path
repo_root = os.path.dirname(
- os.path.dirname(
- os.path.dirname(recipes_cfg_path)))
+ os.path.dirname(os.path.dirname(recipes_cfg_path)))
else:
# find repo_root with git and calculate recipes_cfg_path
- repo_root = (_git_output(
- ['rev-parse', '--show-toplevel'],
- cwd=os.path.abspath(os.path.dirname(__file__))).strip())
+ repo_root = (
+ _git_output(['rev-parse', '--show-toplevel'],
+ cwd=os.path.abspath(os.path.dirname(__file__))).strip())
repo_root = os.path.abspath(repo_root)
recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg')
args = ['--package', recipes_cfg_path] + args
@@ -227,9 +231,9 @@
engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path)
try:
- return _subprocess_call([
- VPYTHON, '-u',
- os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
+ return _subprocess_call(
+ [VPYTHON, '-u',
+ os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
except KeyboardInterrupt:
return 1
