diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 5a34c9faf..6c580d881 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -799,7 +799,7 @@ Returns:   **@property**
— **def [presubmit\_support\_path](/recipes/recipe_modules/presubmit/api.py#24)(self):** ### *recipe_modules* / [tryserver](/recipes/recipe_modules/tryserver) -[DEPS](/recipes/recipe_modules/tryserver/__init__.py#7): [gerrit](#recipe_modules-gerrit), [git](#recipe_modules-git), [git\_cl](#recipe_modules-git_cl), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/tryserver/__init__.py#7): [gerrit](#recipe_modules-gerrit), [git](#recipe_modules-git), [git\_cl](#recipe_modules-git_cl), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step] PYTHON_VERSION_COMPATIBILITY: PY2+3 @@ -880,7 +880,7 @@ Args: Returned paths will be relative to to api.path['root']. -— **def [get\_footer](/recipes/recipe_modules/tryserver/api.py#373)(self, tag, patch_text=None):** +— **def [get\_footer](/recipes/recipe_modules/tryserver/api.py#375)(self, tag, patch_text=None):** Gets a specific tag from a CL description @@ -903,11 +903,11 @@ Returns true iff the properties exist to match a Gerrit issue. Returns true iff we have a change to check out. -— **def [normalize\_footer\_name](/recipes/recipe_modules/tryserver/api.py#381)(self, footer):** +— **def [normalize\_footer\_name](/recipes/recipe_modules/tryserver/api.py#383)(self, footer):** — **def [require\_is\_tryserver](/recipes/recipe_modules/tryserver/api.py#220)(self):** -— **def [set\_change](/recipes/recipe_modules/tryserver/api.py#384)(self, change):** +— **def [set\_change](/recipes/recipe_modules/tryserver/api.py#386)(self, change):** Set the gerrit change for this module. diff --git a/recipes/recipe_modules/tryserver/__init__.py b/recipes/recipe_modules/tryserver/__init__.py index 76c65dfb5..d2a434cfa 100644 --- a/recipes/recipe_modules/tryserver/__init__.py +++ b/recipes/recipe_modules/tryserver/__init__.py @@ -15,7 +15,6 @@ DEPS = [ 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', - 'recipe_engine/python', 'recipe_engine/raw_io', 'recipe_engine/step', ] diff --git a/recipes/recipe_modules/tryserver/api.py b/recipes/recipe_modules/tryserver/api.py index 79637c837..fe0efaaff 100644 --- a/recipes/recipe_modules/tryserver/api.py +++ b/recipes/recipe_modules/tryserver/api.py @@ -364,10 +364,12 @@ class TryserverApi(recipe_api.RecipeApi): 'No patch text or associated changelist, cannot get footers') #pragma: nocover def _get_footer_step(self, patch_text): - result = self.m.python( - 'parse description', self.repo_resource('git_footers.py'), - args=['--json', self.m.json.output()], - stdin=self.m.raw_io.input(data=patch_text)) + result = self.m.step('parse description', [ + 'python3', + self.repo_resource('git_footers.py'), '--json', + self.m.json.output() + ], + stdin=self.m.raw_io.input(data=patch_text)) return result.json.output def get_footer(self, tag, patch_text=None): diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json b/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json index 0f50078bd..670336787 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "RECIPE_REPO[depot_tools]/git_footers.py", "--json", "/path/to/tmp/json" @@ -26,7 +26,7 @@ }, { "cmd": [ - "python", + "python3", "RECIPE_REPO[depot_tools]/git_footers.py", "--json", "/path/to/tmp/json" diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json index b82bb9957..90eb081bd 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json @@ -116,7 +116,7 @@ }, { "cmd": [ - "python", + "python3", "RECIPE_REPO[depot_tools]/git_footers.py", "--json", "/path/to/tmp/json" @@ -204,7 +204,7 @@ }, { "cmd": [ - "python", + "python3", "RECIPE_REPO[depot_tools]/git_footers.py", "--json", "/path/to/tmp/json" diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json index 9a7b089f0..16cdb5739 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json @@ -116,7 +116,7 @@ }, { "cmd": [ - "python", + "python3", "RECIPE_REPO[depot_tools]/git_footers.py", "--json", "/path/to/tmp/json" @@ -204,7 +204,7 @@ }, { "cmd": [ - "python", + "python3", "RECIPE_REPO[depot_tools]/git_footers.py", "--json", "/path/to/tmp/json"