From 274ada0567fe93e581928b95f2875ed345d60cea Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Tue, 8 Feb 2022 20:06:41 +0000 Subject: [PATCH] Reland "Use py3 in gitiles recipe module" This is a reland of 0faae1c8455edaed075218d5ebe0a62588ffed78 Original change's description: > Use py3 in gitiles recipe module > > Recipe-Nontrivial-Roll: build > Recipe-Nontrivial-Roll: chrome_release > Recipe-Nontrivial-Roll: chromiumos > Bug: 1289280 > Change-Id: I182f0e7ad1da58c1c707edd15675f6d30c5faed8 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3438327 > Reviewed-by: Josip Sokcevic > Reviewed-by: Aravind Vasudevan > Commit-Queue: Gavin Mak Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: chrome_release Recipe-Nontrivial-Roll: chromiumos Bug: 1289280 Change-Id: I9ba63a7cd4fea99c2043fae546c63ef942c82802 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3445785 Reviewed-by: Aravind Vasudevan Commit-Queue: Josip Sokcevic --- .vpython3 | 8 ++++---- recipes/recipe_modules/gitiles/api.py | 4 ++-- .../gitiles/examples/full.expected/basic.json | 20 +++++++++---------- .../gitiles/resources/gerrit_client.py | 2 +- .../resources/gerrit_client.py.vpython3 | 11 ++++++++++ 5 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 recipes/recipe_modules/gitiles/resources/gerrit_client.py.vpython3 diff --git a/.vpython3 b/.vpython3 index a23d50bba..ebe9fc64d 100644 --- a/.vpython3 +++ b/.vpython3 @@ -24,6 +24,10 @@ wheel: < name: "infra/python/wheels/httplib2-py3" version: "version:0.13.1" > +wheel: < + name: "infra/python/wheels/six-py2_py3" + version: "version:1.10.0" +> # Used by: # presubmit_support.py @@ -38,10 +42,6 @@ wheel: < name: "infra/python/wheels/python-dateutil-py2_py3" version: "version:2.7.3" > -wheel: < - name: "infra/python/wheels/six-py2_py3" - version: "version:1.10.0" -> # May be required to talk to 3P servers. # Fixes https://crbug.com/1255921 diff --git a/recipes/recipe_modules/gitiles/api.py b/recipes/recipe_modules/gitiles/api.py index 067fc5b12..4787592c3 100644 --- a/recipes/recipe_modules/gitiles/api.py +++ b/recipes/recipe_modules/gitiles/api.py @@ -57,8 +57,8 @@ class Gitiles(recipe_api.RecipeApi): args.extend([ '--accept-statuses', ','.join([str(s) for s in accept_statuses])]) - return self.m.python( - step_name, self.resource('gerrit_client.py'), args, **kwargs) + cmd = ['vpython3', '-u', self.resource('gerrit_client.py')] + args + return self.m.step(step_name, cmd, **kwargs) def refs(self, url, step_name='refs', attempts=None): """Returns a list of refs in the remote repository.""" diff --git a/recipes/recipe_modules/gitiles/examples/full.expected/basic.json b/recipes/recipe_modules/gitiles/examples/full.expected/basic.json index 6caa1ff29..b61b1bf5c 100644 --- a/recipes/recipe_modules/gitiles/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gitiles/examples/full.expected/basic.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -27,7 +27,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -136,7 +136,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -246,7 +246,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -354,7 +354,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -462,7 +462,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -515,7 +515,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -531,7 +531,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -549,7 +549,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", @@ -568,7 +568,7 @@ }, { "cmd": [ - "python", + "vpython3", "-u", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "--json-file", diff --git a/recipes/recipe_modules/gitiles/resources/gerrit_client.py b/recipes/recipe_modules/gitiles/resources/gerrit_client.py index a4ad62e09..db5245528 100755 --- a/recipes/recipe_modules/gitiles/resources/gerrit_client.py +++ b/recipes/recipe_modules/gitiles/resources/gerrit_client.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env vpython3 # Copyright 2014 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/recipes/recipe_modules/gitiles/resources/gerrit_client.py.vpython3 b/recipes/recipe_modules/gitiles/resources/gerrit_client.py.vpython3 new file mode 100644 index 000000000..bdf203193 --- /dev/null +++ b/recipes/recipe_modules/gitiles/resources/gerrit_client.py.vpython3 @@ -0,0 +1,11 @@ +python_version: "3.8" + +wheel: < + name: "infra/python/wheels/httplib2-py3" + version: "version:0.13.1" +> + +wheel: < + name: "infra/python/wheels/six-py2_py3" + version: "version:1.10.0" +>