diff --git a/.gitattributes b/.gitattributes index d8262498e7..24559f1a97 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,7 +11,7 @@ # vpython specs /.vpython* recipes -/gsutil.vpython3 recipes +/gsutil.py.vpython3 recipes # Extensionless tools we want and support scripts. /autoninja* recipes diff --git a/README.md b/README.md index e8e87570d9..525a38bf27 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # depot_tools -Tools for working with Chromium development. It requires python 3.8. +Tools for Chromium development. Requires Python 3.8+. + +gsutil: Python 3.9–3.13 required. ## Tools diff --git a/gsutil.py b/gsutil.py index de742df1b1..1490d6a5b0 100755 --- a/gsutil.py +++ b/gsutil.py @@ -26,7 +26,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR, 'external_bin', 'gsutil') IS_WINDOWS = os.name == 'nt' -VERSION = '4.68' +VERSION = '5.35' # Google OAuth Context required by gsutil. LUCI_AUTH_SCOPES = [ @@ -257,7 +257,7 @@ def run_gsutil(target, args, clean=False): cmd = [ 'vpython3', '-vpython-spec', - os.path.join(THIS_DIR, 'gsutil.vpython3'), '--', gsutil_bin + os.path.join(THIS_DIR, 'gsutil.py.vpython3'), '--', gsutil_bin ] + args_opt + args boto_path = get_boto_path() diff --git a/gsutil.vpython3 b/gsutil.py.vpython3 similarity index 91% rename from gsutil.vpython3 rename to gsutil.py.vpython3 index a0e0a89e4b..d3ca78d424 100644 --- a/gsutil.vpython3 +++ b/gsutil.py.vpython3 @@ -11,9 +11,9 @@ # "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: "3.11" wheel: < name: "infra/python/wheels/crcmod/${vpython_platform}" - version: "version:1.7.chromium.3" + version: "version:1.7.chromium.4" >