From de2be4d99991f2926850d93ef5aaf3b3e539c988 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 4 Jan 2025 10:14:05 +0100 Subject: [PATCH] google-cloud-cli: add v504.0.1, document Python version support (#48339) Co-authored-by: adamjstewart --- .../packages/google-cloud-cli/package.py | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/google-cloud-cli/package.py b/var/spack/repos/builtin/packages/google-cloud-cli/package.py index ab8fa02acf4..37ca1e4919a 100644 --- a/var/spack/repos/builtin/packages/google-cloud-cli/package.py +++ b/var/spack/repos/builtin/packages/google-cloud-cli/package.py @@ -7,23 +7,40 @@ from spack.package import * versions = { - "426.0.0": { - "linux": { - "arm": "8409b8cc00f0ae8089be97d8a565f4072eada890776345bccb988bcd4d4bb27f", - "x86_64": "c653a8ac1e48889005fd00e2de580a27be5a3cb46ceccc570146982c4ddf4245", - "x86": "13e8b75a3ba352bda58e9974ed5779c16a6631e2957ea6e43cf3b11d5da49ae7", + "504.0.1": { + "darwin": { + "arm": "00485cda52bcb80ae796914304dff59ec609eafe1153474746c5ac3bc576a574", + "x86": "3400783268ff25bfdab23ad52ad7de00e2b794ce6d14790316af77e84f7eb3f0", + "x86_64": "7900504a22bb918563d74446a794308eb3da55e7e2b0b20d6545c950def7ffd0", }, + "linux": { + "arm": "89d148e4dc5837a6ed7292237b49171051ce054886838ada0aca4f4f3f9b7bba", + "x86": "e85d4623795ef3bb3d003b457b65f2599176432bacdec92d6010d12922b75df4", + "x86_64": "a01ff5312980a18b073c9d2cd6f287ff7d2684f33bd4c927aec20d1d17344874", + }, + "windows": { + "arm": "33601f2e3e8b13baaad74216d401f3e40e475a30bcfc50bf7d8c5e57247a5e64", + "x86": "c5c00ecac095e60fa347b124c024496e7af3cf3d61de5a68be766ee7c997b987", + "x86_64": "02665dc0b9c76c154029e921cecd493da8023de491439c99557cf36fd4b4d954", + }, + }, + "426.0.0": { "darwin": { "arm": "5228c93f04af2e3eda3cf03c18bcc75a5440c62170fcdcd46e77e4e97452786a", - "x86_64": "1ac867378e8e6d59aacadfa0a5282b549146cd8bcd971341d047006c6f702c63", "x86": "dd95eb5f3ef82825f3e930f538c3964c5ae37e3bf35492e21f5fed3916b980c0", + "x86_64": "1ac867378e8e6d59aacadfa0a5282b549146cd8bcd971341d047006c6f702c63", + }, + "linux": { + "arm": "8409b8cc00f0ae8089be97d8a565f4072eada890776345bccb988bcd4d4bb27f", + "x86": "13e8b75a3ba352bda58e9974ed5779c16a6631e2957ea6e43cf3b11d5da49ae7", + "x86_64": "c653a8ac1e48889005fd00e2de580a27be5a3cb46ceccc570146982c4ddf4245", }, "windows": { "arm": "d45bdb6808ca737b6c14d6ac85f3380ab1037eeb3c641164d5d4fad032d382af", - "x86_64": "2a5199f04414df36e483c892d0e89cdc9e962266414ce7990cf2b59058b94e9b", "x86": "c04c39b6a7c82365f3c4a0d79ed60dbc6c5ce672970a87a70478bb7c55926852", + "x86_64": "2a5199f04414df36e483c892d0e89cdc9e962266414ce7990cf2b59058b94e9b", }, - } + }, } targets = {"aarch64": "arm", "arm64": "arm", "amd64": "x86_64", "x86_64": "x86_64", "x86": "x86"} @@ -48,9 +65,14 @@ class GoogleCloudCli(Package): if system in versions[ver] and machine in versions[ver][system]: version(ver, sha256=versions[ver][system][machine]) - depends_on("c", type="build") # generated + depends_on("c", type="build") - depends_on("python", type=("build", "run")) + # RELEASE_NOTES + with default_args(type=("build", "run")): + depends_on("python") + depends_on("python@:3.13", when="@500:") + depends_on("python@:3.12", when="@456:499") + depends_on("python@:3.10", when="@:455") def url_for_version(self, version): return f"https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-{version}-{self.system}-{self.machine}.{self.ext}"