From 9d351f8b5aa6d0362eae0c6d32b4e9b6ef3207bf Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Thu, 10 Nov 2022 19:02:31 +0000 Subject: [PATCH] Revert "Update Presubmit to python3" This reverts commit 1b7204d841733354d55be3655e5dd10047e9c2c7. Reason for revert: py2 presubmits no longer running, and some aren't migrated to run py3 yet. Original change's description: > Update Presubmit to python3 > > Recipe-Nontrivial-Roll: build > Bug:1370463 > Change-Id: I0bf182badc16f0d75c7330f52906f4cf9ff66e08 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3975294 > Reviewed-by: Josip Sokcevic > Commit-Queue: Riley Wong Change-Id: I82c3f0f0d502ee896d4e79a6bb330aee71b4d309 Recipe-Nontrivial-Roll: build Bug: 1370463 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4021307 Reviewed-by: Gavin Mak Commit-Queue: Josip Sokcevic --- recipes/recipe_modules/presubmit/api.py | 2 +- .../recipe_modules/presubmit/examples/full.expected/basic.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipe_modules/presubmit/api.py b/recipes/recipe_modules/presubmit/api.py index a99e2eb76..c8ef47cfd 100644 --- a/recipes/recipe_modules/presubmit/api.py +++ b/recipes/recipe_modules/presubmit/api.py @@ -30,7 +30,7 @@ class PresubmitApi(recipe_api.RecipeApi): name = kwargs.pop('name', 'presubmit') with self.m.depot_tools.on_path(): - cmd = ['vpython3', self.presubmit_support_path] + cmd = ['vpython', self.presubmit_support_path] cmd.extend(args) cmd.extend(['--json_output', self.m.json.output()]) if self.m.resultdb.enabled: diff --git a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json index 4a0e8b9cd..42490d5e6 100644 --- a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json +++ b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "vpython3", + "vpython", "RECIPE_REPO[depot_tools]/presubmit_support.py", "--json_output", "/path/to/tmp/json"