Reland "depot_tools: Add httplib2 to .vpython"

This is a reland of e1410883a3 Use vpython to execute git_cl.py, gerrit_util.py and presubmit_support.py on recipes. Original change's description: > depot_tools: Add httplib2 to .vpython > > Check that things won't break before further changes are made. > > Bug: 1002153 > Change-Id: I41866f26334bf9ec2732bc0f25007234a95130e4 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1854749 > Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Andrii Shyshkalov <tandrii@google.com> > Reviewed-by: Andrii Shyshkalov <tandrii@google.com> Bug: 1002153 Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: chromiumos Recipe-Nontrivial-Roll: infra Recipe-Nontrivial-Roll: skia Recipe-Nontrivial-Roll: build_limited_scripts_slave Recipe-Nontrivial-Roll: release_scripts Change-Id: Id94057eae8830dec197257df3ea35c0c4ff946b7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1856650 Reviewed-by: Andrii Shyshkalov <tandrii@google.com> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
6 years ago · 88d7869db0
parent 2cbae8a8b9
commit 88d7869db0
23 changed files with 46 additions and 40 deletions
--- a/.vpython
+++ b/.vpython
@ -1 +1,6 @@
 python_version: "2.7"
+
+wheel: <
+  name: "infra/python/wheels/httplib2-py2_py3"
+  version: "version:0.10.3"
+>
--- a/auth.py
+++ b/auth.py
@ -9,6 +9,7 @@ from __future__ import print_function
 import collections
 import datetime
 import functools
+import httplib2
 import json
 import logging
 import optparse
@ -20,7 +21,6 @@ import urlparse

 import subprocess2

-from third_party import httplib2
 from third_party.oauth2client import client


--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@ -344,16 +344,16 @@ Module for interact with gerrit endpoints

 Wrapper for easy calling of gerrit_utils steps.

-&mdash; **def [abandon\_change](/recipes/recipe_modules/gerrit/api.py#159)(self, host, change, message=None, name=None, step_test_data=None):**
+&mdash; **def [abandon\_change](/recipes/recipe_modules/gerrit/api.py#160)(self, host, change, message=None, name=None, step_test_data=None):**

-&mdash; **def [create\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#31)(self, host, project, branch, commit, \*\*kwargs):**
+&mdash; **def [create\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#32)(self, host, project, branch, commit, \*\*kwargs):**

 Create a new branch from given project and commit

 Returns:
  the ref of the branch created

-&mdash; **def [get\_change\_description](/recipes/recipe_modules/gerrit/api.py#72)(self, host, change, patchset):**
+&mdash; **def [get\_change\_description](/recipes/recipe_modules/gerrit/api.py#73)(self, host, change, patchset):**

 Get the description for a given CL and patchset.

@ -365,7 +365,7 @@ Args:
 Returns:
  The description corresponding to given CL and patchset.

-&mdash; **def [get\_changes](/recipes/recipe_modules/gerrit/api.py#117)(self, host, query_params, start=None, limit=None, o_params=None, step_test_data=None, \*\*kwargs):**
+&mdash; **def [get\_changes](/recipes/recipe_modules/gerrit/api.py#118)(self, host, query_params, start=None, limit=None, o_params=None, step_test_data=None, \*\*kwargs):**

 Query changes for the given host.

@ -383,14 +383,14 @@ Returns:
  A list of change dicts as documented here:
      https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-changes

-&mdash; **def [get\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#53)(self, host, project, branch, \*\*kwargs):**
+&mdash; **def [get\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#54)(self, host, project, branch, \*\*kwargs):**

 Get a branch from given project and commit

 Returns:
  the revision of the branch

-&mdash; **def [get\_revision\_info](/recipes/recipe_modules/gerrit/api.py#87)(self, host, change, patchset):**
+&mdash; **def [get\_revision\_info](/recipes/recipe_modules/gerrit/api.py#88)(self, host, change, patchset):**

 Returns the info for a given patchset of a given change.

--- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/gerrit/api.py
+++ b/recipes/recipe_modules/gerrit/api.py
@ -26,6 +26,7 @@ class GerritApi(recipe_api.RecipeApi):
                           self.repo_resource('gerrit_client.py'),
                           cmd,
                           infra_step=infra_step,
+                           venv=True,
                           **kwargs)

  def create_gerrit_branch(self, host, project, branch, commit, **kwargs):
--- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "branch",
@ -32,7 +32,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "branchinfo",
@ -60,7 +60,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
@ -110,7 +110,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
@ -137,7 +137,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
@ -185,7 +185,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "abandon",
@ -229,7 +229,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/git_cl/api.py
+++ b/recipes/recipe_modules/git_cl/api.py
@ -18,7 +18,7 @@ class GitClApi(recipe_api.RecipeApi):
    with self.m.context(cwd=self.m.context.cwd or my_loc):
      return self.m.python(
          name, self.repo_resource('git_cl.py'), [subcmd] + args,
-          **kwargs)
+          venv=True, **kwargs)

  def get_description(self, patch_url=None, codereview=None, **kwargs):
    """DEPRECATED. Consider using gerrit.get_change_description instead."""
--- a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "upload",
@ -12,7 +12,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "issue"
@ -21,7 +21,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "description",
@ -33,7 +33,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "description",
@ -54,7 +54,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "description",
@ -72,7 +72,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "description",
@ -85,7 +85,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/git_cl.py",
      "description",
--- a/recipes/recipe_modules/presubmit/api.py
+++ b/recipes/recipe_modules/presubmit/api.py
@ -106,7 +106,7 @@ class PresubmitApi(recipe_api.RecipeApi):
      '--upstream', upstream,  # '' if not in bot_update mode.
    ])

-    venv = None
+    venv = True
    # TODO(iannucci): verify that presubmit_support.py correctly finds and
    # uses .vpython files, then remove this configuration.
    if self._vpython_spec_path:
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
@ -41,7 +41,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
@ -1,7 +1,7 @@
 [
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
@ -41,7 +41,7 @@
  },
  {
    "cmd": [
-      "python",
+      "vpython",
      "-u",
      "RECIPE_REPO[depot_tools]/gerrit_client.py",
      "changes",
--- a/tests/auth_test.py
+++ b/tests/auth_test.py
@ -7,6 +7,7 @@

 import __builtin__
 import datetime
+import httplib2
 import json
 import logging
 import os
@ -18,7 +19,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))


 from testing_support import auto_stub
-from third_party import httplib2
 from third_party import mock

 import auth