Invoke git_setup with py3

The script is already py3 compatible. Bug: 1289280 Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: build_limited Recipe-Nontrivial-Roll: chrome_release Recipe-Nontrivial-Roll: infra Change-Id: I2dfd202fcb7981e5129a777424f7f730f8f33998 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3438328 Reviewed-by: Gavin Mak <gavinmak@google.com> Commit-Queue: Josip Sokcevic <sokcevic@google.com>
3 years ago · df01c5ad5b
parent 0faae1c845
commit df01c5ad5b
24 changed files with 32 additions and 33 deletions
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@ -384,7 +384,7 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3

 Returns a git command step.

-&mdash; **def [bundle\_create](/recipes/recipe_modules/git/api.py#383)(self, bundle_path, rev_list_args=None, \*\*kwargs):**
+&mdash; **def [bundle\_create](/recipes/recipe_modules/git/api.py#382)(self, bundle_path, rev_list_args=None, \*\*kwargs):**

 Runs 'git bundle create' on a Git repository.

@ -437,7 +437,7 @@ Args:
 Returns: If the checkout was successful, this returns the commit hash of
  the checked-out-repo. Otherwise this returns None.

-&mdash; **def [config\_get](/recipes/recipe_modules/git/api.py#352)(self, prop_name, \*\*kwargs):**
+&mdash; **def [config\_get](/recipes/recipe_modules/git/api.py#351)(self, prop_name, \*\*kwargs):**

 Returns git config output.

@ -464,7 +464,7 @@ Returns:

 Fetches all tags from the remote.

-&mdash; **def [get\_remote\_url](/recipes/recipe_modules/git/api.py#371)(self, remote_name=None, \*\*kwargs):**
+&mdash; **def [get\_remote\_url](/recipes/recipe_modules/git/api.py#370)(self, remote_name=None, \*\*kwargs):**

 Returns the remote Git repository URL, or None.

@ -474,11 +474,11 @@ Args:

 Returns: (str) The URL of the remote Git repository, or None.

-&mdash; **def [get\_timestamp](/recipes/recipe_modules/git/api.py#323)(self, commit='HEAD', test_data=None, \*\*kwargs):**
+&mdash; **def [get\_timestamp](/recipes/recipe_modules/git/api.py#322)(self, commit='HEAD', test_data=None, \*\*kwargs):**

 Find and return the timestamp of the given commit.

-&mdash; **def [new\_branch](/recipes/recipe_modules/git/api.py#396)(self, branch, name=None, upstream=None, upstream_current=False, \*\*kwargs):**
+&mdash; **def [new\_branch](/recipes/recipe_modules/git/api.py#395)(self, branch, name=None, upstream=None, upstream_current=False, \*\*kwargs):**

 Runs git new-branch on a Git repository, to be used before git cl
 upload.
@ -490,7 +490,7 @@ Args:
  * upstream_current (bool): whether to use '--upstream_current'.
  * kwargs: Forwarded to '__call__'.

-&mdash; **def [number](/recipes/recipe_modules/git/api.py#427)(self, commitrefs=None, test_values=None):**
+&mdash; **def [number](/recipes/recipe_modules/git/api.py#426)(self, commitrefs=None, test_values=None):**

 Computes the generation number of some commits.

@ -507,7 +507,7 @@ A list of strings containing the generation numbers of the commits.
 If non-empty commitrefs was provided, the order of the returned
 numbers will correspond to the order of the provided commitrefs.

-&mdash; **def [rebase](/recipes/recipe_modules/git/api.py#332)(self, name_prefix, branch, dir_path, remote_name=None, \*\*kwargs):**
+&mdash; **def [rebase](/recipes/recipe_modules/git/api.py#331)(self, name_prefix, branch, dir_path, remote_name=None, \*\*kwargs):**

 Runs rebase HEAD onto branch

--- a/recipes/recipe_modules/git/api.py
+++ b/recipes/recipe_modules/git/api.py
@ -186,10 +186,9 @@ class GitApi(recipe_api.RecipeApi):
      remote_name = 'origin'

    step_suffix = '' if step_suffix is  None else ' (%s)' % step_suffix
-    self.m.python(
+    self.m.step(
        'git setup%s' % step_suffix,
-        self.resource('git_setup.py'),
-        git_setup_args)
+        ['python3', '-u', self.resource('git_setup.py')] + git_setup_args)

    # Some of the commands below require depot_tools to be in PATH.
    path = self.m.path.pathsep.join([
--- a/recipes/recipe_modules/git/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/basic_branch.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_branch.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/basic_hash.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_hash.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/basic_ref.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_ref.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/basic_tags.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_tags.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
+++ b/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
+++ b/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
+++ b/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
@ -184,7 +184,7 @@
      "Traceback (most recent call last):",
      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/git/examples/full.py\", line 81, in RunSteps",
      "    api.git.new_branch('failed_new_branch', upstream='will_fail', upstream_current=True) #pylint: disable = line-too-long",
-      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/git/api.py\", line 413, in new_branch",
+      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/git/api.py\", line 412, in new_branch",
      "    raise ValueError('Can not define both upstream and upstream_current')",
      "ValueError('Can not define both upstream and upstream_current')"
    ]
--- a/recipes/recipe_modules/git/examples/full.expected/platform_win.json
+++ b/recipes/recipe_modules/git/examples/full.expected/platform_win.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
+++ b/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
+++ b/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "python3",
      "-u",
      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
      "--path",
--- a/recipes/recipe_modules/git/resources/git_setup.py
+++ b/recipes/recipe_modules/git/resources/git_setup.py
@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2013 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.