From 9d77ca716ffdd46eb4be7d5638939da5e8ffb5ef Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Mon, 30 Jan 2023 03:00:48 +0000 Subject: [PATCH] [recipe] Remove depot_tools.{ninja_path, autoninja_path} recipe APIs I have replaced all the references, and there should be no references to these APIs anymore. A PSA has been sent already. http://g/chromium-dev-internal/n2IL0Mbh0E8 Bug: 1340825 Change-Id: Ife882f4427f8841cacb9a70a99dbd6a90c741da2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4194896 Reviewed-by: Takuto Ikuta Commit-Queue: Junji Watanabe Reviewed-by: Gavin Mak --- recipes/README.recipes.md | 8 ++------ recipes/recipe_modules/depot_tools/api.py | 10 ---------- .../depot_tools/examples/full.expected/basic.json | 14 -------------- .../depot_tools/examples/full.expected/win.json | 14 -------------- .../recipe_modules/depot_tools/examples/full.py | 6 ------ 5 files changed, 2 insertions(+), 50 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index c7db23fdd..3437c4873 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -128,8 +128,6 @@ the depot_tools repo. #### **class [DepotToolsApi](/recipes/recipe_modules/depot_tools/api.py#12)([RecipeApi][recipe_engine/wkt/RecipeApi]):** -  **@property**
— **def [autoninja\_path](/recipes/recipe_modules/depot_tools/api.py#49)(self):** -   **@property**
— **def [cros\_path](/recipes/recipe_modules/depot_tools/api.py#30)(self):**   **@property**
— **def [download\_from\_google\_storage\_path](/recipes/recipe_modules/depot_tools/api.py#17)(self):** @@ -138,9 +136,7 @@ the depot_tools repo.   **@property**
— **def [gsutil\_py\_path](/recipes/recipe_modules/depot_tools/api.py#40)(self):** -  **@property**
— **def [ninja\_path](/recipes/recipe_modules/depot_tools/api.py#44)(self):** - -  **@contextlib.contextmanager**
— **def [on\_path](/recipes/recipe_modules/depot_tools/api.py#58)(self):** +  **@contextlib.contextmanager**
— **def [on\_path](/recipes/recipe_modules/depot_tools/api.py#48)(self):** Use this context manager to put depot_tools on $PATH. @@ -151,7 +147,7 @@ with api.depot_tools.on_path(): # run some steps ``` -  **@property**
— **def [presubmit\_support\_py\_path](/recipes/recipe_modules/depot_tools/api.py#54)(self):** +  **@property**
— **def [presubmit\_support\_py\_path](/recipes/recipe_modules/depot_tools/api.py#44)(self):**   **@property**
— **def [root](/recipes/recipe_modules/depot_tools/api.py#25)(self):** diff --git a/recipes/recipe_modules/depot_tools/api.py b/recipes/recipe_modules/depot_tools/api.py index 37a7963f7..3c53cf019 100644 --- a/recipes/recipe_modules/depot_tools/api.py +++ b/recipes/recipe_modules/depot_tools/api.py @@ -41,16 +41,6 @@ class DepotToolsApi(recipe_api.RecipeApi): def gsutil_py_path(self): return self.repo_resource('gsutil.py') - @property - def ninja_path(self): - ninja_exe = 'ninja.exe' if self.m.platform.is_win else 'ninja' - return self.repo_resource(ninja_exe) - - @property - def autoninja_path(self): - autoninja = 'autoninja.bat' if self.m.platform.is_win else 'autoninja' - return self.repo_resource(autoninja) - @property def presubmit_support_py_path(self): return self.repo_resource('presubmit_support.py') diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json index 0826600bf..03636dbe1 100644 --- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json +++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json @@ -41,20 +41,6 @@ ], "name": "gsutil_py_path" }, - { - "cmd": [ - "ls", - "RECIPE_REPO[depot_tools]/ninja" - ], - "name": "ninja_path" - }, - { - "cmd": [ - "ls", - "RECIPE_REPO[depot_tools]/autoninja" - ], - "name": "autoninja_path" - }, { "cmd": [ "ls", diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json index bce098696..c4c8963cd 100644 --- a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json +++ b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json @@ -41,20 +41,6 @@ ], "name": "gsutil_py_path" }, - { - "cmd": [ - "ls", - "RECIPE_REPO[depot_tools]\\ninja.exe" - ], - "name": "ninja_path" - }, - { - "cmd": [ - "ls", - "RECIPE_REPO[depot_tools]\\autoninja.bat" - ], - "name": "autoninja_path" - }, { "cmd": [ "ls", diff --git a/recipes/recipe_modules/depot_tools/examples/full.py b/recipes/recipe_modules/depot_tools/examples/full.py index 2d481d38d..ace3d486b 100644 --- a/recipes/recipe_modules/depot_tools/examples/full.py +++ b/recipes/recipe_modules/depot_tools/examples/full.py @@ -32,12 +32,6 @@ def RunSteps(api): api.step( 'gsutil_py_path', ['ls', api.depot_tools.gsutil_py_path]) - api.step( - 'ninja_path', ['ls', api.depot_tools.ninja_path]) - - api.step( - 'autoninja_path', ['ls', api.depot_tools.autoninja_path]) - api.step( 'presubmit_support_py_path', ['ls', api.depot_tools.presubmit_support_py_path])