InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reland "Use py3 in gitiles recipe module"

Browse Source 
This is a reland of 0faae1c845

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/+/3445785
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
This commit is contained in:
Josip Sokcevic
2022-02-08 20:06:41 +00:00
committed by LUCI CQ
parent 8b64ddec2a
commit 274ada0567
5 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.vpython3
View File

@@ -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

4
recipes/recipe_modules/gitiles/api.py
View File

@@ -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."""

20
recipes/recipe_modules/gitiles/examples/full.expected/basic.json
View File

@@ -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",

2
recipes/recipe_modules/gitiles/resources/gerrit_client.py
View File

@@ -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.

11
recipes/recipe_modules/gitiles/resources/gerrit_client.py.vpython3 Normal file
View File

@@ -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"
>