Commit 37db69d4 authored by Gavin Mak's avatar Gavin Mak Committed by LUCI CQ

Revert "Update gsutil to use gsutil version 4.68"

This reverts commit 8edc960e.

Reason for revert: potentially breaking chromeos builders

Original change's description:
> Update gsutil to use gsutil version 4.68
>
> We can't yet upgrade to version 5.x since it's only py3 compatbile and
> some builders still rely on running gsutil with py2.
>
> R=​gavinmak@google.com
>
> Bug: 1184108
> Change-Id: I002cc3625a2184ab42383b88a014c0631d1a33ee
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3508516
> Reviewed-by: Gavin Mak <gavinmak@google.com>
> Commit-Queue: Josip Sokcevic <sokcevic@google.com>

Bug: 1184108
Change-Id: I40ce645ebd928c63116012353c632026c787b154
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3514508
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
parent 48034f27
......@@ -34,7 +34,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR, 'external_bin', 'gsutil')
IS_WINDOWS = os.name == 'nt'
VERSION = '4.68'
VERSION = '4.28'
class InvalidGsutilError(Exception):
......@@ -166,7 +166,9 @@ def run_gsutil(target, args, clean=False):
assert sys.platform != 'cygwin'
cmd = [
sys.executable,
'vpython',
'-vpython-spec', os.path.join(THIS_DIR, 'gsutil.vpython'),
'--',
gsutil_bin
] + args_opt + args
return subprocess.call(cmd, shell=IS_WINDOWS)
......
......@@ -11,7 +11,92 @@
# "gsutil", where a stock system-deployed file in "/etc/" explicitly specifies
# that the "google_compute_engine" and "boto" Python packages are available.
python_version: "3.8"
python_version: "2.7"
wheel <
name: "infra/python/wheels/google_compute_engine-py2_py3"
version: "version:2.6.2"
>
wheel <
name: "infra/python/wheels/boto-py2_py3"
version: "version:2.48.0"
>
# "gsutil" on non-GCE can require PyOpenSSL, which, in turn, requires
# "cryptography".
wheel: <
name: "infra/python/wheels/pyopenssl-py2_py3"
version: "version:17.2.0"
>
##
# BEGIN "cryptography" dependencies.
##
wheel: <
name: "infra/python/wheels/cryptography/${vpython_platform}"
version: "version:2.9.2.chromium.1"
>
wheel: <
name: "infra/python/wheels/appdirs-py2_py3"
version: "version:1.4.3"
>
wheel: <
name: "infra/python/wheels/enum34-py2"
version: "version:1.1.6"
>
wheel: <
name: "infra/python/wheels/cffi/${vpython_platform}"
version: "version:1.14.5.chromium.7"
>
wheel: <
name: "infra/python/wheels/idna-py2_py3"
version: "version:2.5"
>
wheel: <
name: "infra/python/wheels/ipaddress-py2"
version: "version:1.0.18"
>
wheel: <
name: "infra/python/wheels/packaging-py2_py3"
version: "version:16.8"
>
wheel: <
name: "infra/python/wheels/pyasn1-py2_py3"
version: "version:0.2.3"
>
wheel: <
name: "infra/python/wheels/pycparser-py2_py3"
version: "version:2.17"
>
wheel: <
name: "infra/python/wheels/pyparsing-py2_py3"
version: "version:2.2.0"
>
wheel: <
name: "infra/python/wheels/setuptools-py2_py3"
version: "version:34.3.2"
>
wheel: <
name: "infra/python/wheels/six-py2_py3"
version: "version:1.10.0"
>
##
# END "cryptography" dependencies.
##
wheel: <
name: "infra/python/wheels/crcmod/${vpython_platform}"
......
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