Commit 274ada05 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by LUCI CQ

Reland "Use py3 in gitiles recipe module"

This is a reland of 0faae1c8

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 <sokcevic@google.com>
> Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
> Commit-Queue: Gavin Mak <gavinmak@google.com>

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/+/3445785Reviewed-by: 's avatarAravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
parent 8b64ddec
...@@ -24,6 +24,10 @@ wheel: < ...@@ -24,6 +24,10 @@ wheel: <
name: "infra/python/wheels/httplib2-py3" name: "infra/python/wheels/httplib2-py3"
version: "version:0.13.1" version: "version:0.13.1"
> >
wheel: <
name: "infra/python/wheels/six-py2_py3"
version: "version:1.10.0"
>
# Used by: # Used by:
# presubmit_support.py # presubmit_support.py
...@@ -38,10 +42,6 @@ wheel: < ...@@ -38,10 +42,6 @@ wheel: <
name: "infra/python/wheels/python-dateutil-py2_py3" name: "infra/python/wheels/python-dateutil-py2_py3"
version: "version:2.7.3" 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. # May be required to talk to 3P servers.
# Fixes https://crbug.com/1255921 # Fixes https://crbug.com/1255921
......
...@@ -57,8 +57,8 @@ class Gitiles(recipe_api.RecipeApi): ...@@ -57,8 +57,8 @@ class Gitiles(recipe_api.RecipeApi):
args.extend([ args.extend([
'--accept-statuses', '--accept-statuses',
','.join([str(s) for s in accept_statuses])]) ','.join([str(s) for s in accept_statuses])])
return self.m.python( cmd = ['vpython3', '-u', self.resource('gerrit_client.py')] + args
step_name, self.resource('gerrit_client.py'), args, **kwargs) return self.m.step(step_name, cmd, **kwargs)
def refs(self, url, step_name='refs', attempts=None): def refs(self, url, step_name='refs', attempts=None):
"""Returns a list of refs in the remote repository.""" """Returns a list of refs in the remote repository."""
......
[ [
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -515,7 +515,7 @@ ...@@ -515,7 +515,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
...@@ -568,7 +568,7 @@ ...@@ -568,7 +568,7 @@
}, },
{ {
"cmd": [ "cmd": [
"python", "vpython3",
"-u", "-u",
"RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py", "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
"--json-file", "--json-file",
......
#!/usr/bin/env python #!/usr/bin/env vpython3
# Copyright 2014 The Chromium Authors. All rights reserved. # Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
......
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"
>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment