Revert "Update gsutil to use gsutil version 4.61, python3."
This reverts commit f059ec9368.
Reason for revert: Reverting because we probably need to be using vpython and a compiled crcmod instead. See, e.g.,. b/188591640.
Original change's description:
> Update gsutil to use gsutil version 4.61, python3.
>
> This CL updates the gsutil.py wrapper to download and use
> v4.61 of GCP's gsutil, which is Python3-compatible.
>
> v4.61 appears to be fully self-contained and have all of the
> packages it needs vendored into it. So, there's no reason to
> use vpython anymore, and this CL removes that.
>
> Also, this CL removes the 'fallback' option to gsutil and
> the ability to force a version switch, as this should no
> longer be necessary (it was added for a migration back in 2014
> but apparently this code was never removed afterwards).
>
> This CL also updates download_from_google_storage.py and
> upload_to_google_storage.py to similarly not have the version flags
> and to just use regular python3, not vpython3.
>
> Bug: 1184108
> Change-Id: I0d1a8351dba2d3ad1f927afa333fb10959f19443
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2898439
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
> Reviewed-by: Josip Sokcevic <sokcevic@google.com>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Dirk Pranke <dpranke@google.com>
Bug: 1184108
Change-Id: I8e21a9a40d81e4e185642f866855b6838f80f1c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2905904
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
changes/04/2905904/2
Dirk Pranke
4 years ago
committed by
LUCI CQ
parent
68324eff2f
commit
af121aeec9
@ -0,0 +1,115 @@
|
||||
# vpython VirtualEnv protobuf for "gsutil".
|
||||
#
|
||||
# See:
|
||||
# https://chromium.googlesource.com/infra/luci/luci-go/+/HEAD/vpython/api/vpython/spec.proto
|
||||
#
|
||||
# This is a "vpython" VirtualEnv specification applied to invocations of "gsutil"
|
||||
# by the bootstrap wrapper, "gsutil.py". It ensures that any Python distribution
|
||||
# has the expected Python packages installed.
|
||||
#
|
||||
# This is specifically relevant on Google Compute Engine invocations of
|
||||
# "gsutil", where a stock system-deployed file in "/etc/" explicitly specifies
|
||||
# that the "google_compute_engine" and "boto" Python packages are available.
|
||||
|
||||
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"
|
||||
>
|
||||
|
||||
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"
|
||||
>
|
||||
|
||||
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}"
|
||||
version: "version:1.7"
|
||||
match_tag: <
|
||||
abi: "cp27mu"
|
||||
platform: "manylinux1_i686"
|
||||
>
|
||||
match_tag: <
|
||||
abi: "cp27mu"
|
||||
platform: "manylinux1_x86_64"
|
||||
>
|
||||
match_tag: <
|
||||
platform: "macosx_10_6_intel"
|
||||
>
|
||||
>
|
||||
Loading…
Reference in New Issue