From e1b48631b2f0e41767456a06260301a43512cca7 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Wed, 26 Jan 2022 20:12:55 +0000 Subject: [PATCH] Remove deprecated arguments in bot_update recipe R=gavinmak@google.com Change-Id: I37bbdf02bfd32577224224a3114171810a7318fd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3416677 Commit-Queue: Josip Sokcevic Auto-Submit: Josip Sokcevic Reviewed-by: Gavin Mak Commit-Queue: Gavin Mak --- recipes/README.recipes.md | 8 ++++---- recipes/recipe_modules/bot_update/api.py | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 5d7ba912f9..c08e8391a8 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -58,12 +58,12 @@ Recipe module to ensure a checkout is consistent on a bot. Wrapper for easy calling of bot_update. -— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#534)(self, bot_update_step):** +— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#522)(self, bot_update_step):** Deapplies a patch, taking care of DEPS and solution revisions properly. -— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#81)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):** +— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#81)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, clobber=False, root_solution_revision=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):** Args: * gclient_config: The gclient configuration to use when running bot_update. @@ -95,7 +95,7 @@ Args: bot_update module ONLY supports one change. Users may specify a change via tryserver.set_change() and explicitly set this flag False. -— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#511)(self, project_name, gclient_config=None):** +— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#499)(self, project_name, gclient_config=None):** Returns all property names used for storing the checked-out revision of a given project. @@ -111,7 +111,7 @@ Returns (list of str): All properties that'll hold the checked-out revision   **@property**
— **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#49)(self):** -— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#462)(self, bot_update_json, name):** +— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#450)(self, bot_update_json, name):** Sets a fixed revision for a single dependency using project revision properties. diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 899c626cf5..4d331f3457 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -88,14 +88,8 @@ class BotUpdateApi(recipe_api.RecipeApi): with_tags=False, no_fetch_tags=False, refs=None, - patch_oauth2=None, - oauth2_json=None, - use_site_config_creds=None, clobber=False, root_solution_revision=None, - rietveld=None, - issue=None, - patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, @@ -138,12 +132,6 @@ class BotUpdateApi(recipe_api.RecipeApi): bot_update module ONLY supports one change. Users may specify a change via tryserver.set_change() and explicitly set this flag False. """ - assert use_site_config_creds is None, "use_site_config_creds is deprecated" - assert rietveld is None, "rietveld is deprecated" - assert issue is None, "issue is deprecated" - assert patchset is None, "patchset is deprecated" - assert patch_oauth2 is None, "patch_oauth2 is deprecated" - assert oauth2_json is None, "oauth2_json is deprecated" assert not (ignore_input_commit and set_output_commit) if assert_one_gerrit_change: assert len(self.m.buildbucket.build.input.gerrit_changes) <= 1, (