From 20fc5a174a9f78b4eda963aab501c7bebe42b369 Mon Sep 17 00:00:00 2001
From: Maciej Wójcik <w8jcik@gmail.com>
Date: Fri, 23 Feb 2024 11:18:45 +0100
Subject: py-s3transfer, py-boto3, py-botocore: add new versions (#42741)

* py-s3transfer: add new versions

* py-boto3: add new versions

* py-botocore: add new versions

* py-boto3: correct version ranges
---
 var/spack/repos/builtin/packages/py-boto3/package.py      |  9 ++++++++-
 var/spack/repos/builtin/packages/py-botocore/package.py   |  5 ++++-
 var/spack/repos/builtin/packages/py-s3transfer/package.py | 13 ++++++++-----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/var/spack/repos/builtin/packages/py-boto3/package.py b/var/spack/repos/builtin/packages/py-boto3/package.py
index 401af84037..f38952d305 100644
--- a/var/spack/repos/builtin/packages/py-boto3/package.py
+++ b/var/spack/repos/builtin/packages/py-boto3/package.py
@@ -12,6 +12,7 @@ class PyBoto3(PythonPackage):
     homepage = "https://github.com/boto/boto3"
     pypi = "boto3/boto3-1.10.44.tar.gz"
 
+    version("1.34.44", sha256="86bcf79a56631609a9f8023fe8f53e2869702bdd4c9047c6d9f091eb39c9b0fa")
     version("1.26.26", sha256="a2349d436db6f6aa1e0def5501e4884572eb6f008f35063a359a6fa8ba3539b7")
     version("1.25.5", sha256="aec7db139429fe0f3fbe723170461192b0483b0070114a4b56351e374e0f294d")
     version("1.24.96", sha256="6b8899542cff82becceb3498a2240bf77c96def0515b0a31f7f6a9d5b92e7a3d")
@@ -36,6 +37,7 @@ class PyBoto3(PythonPackage):
     depends_on("python@2.6:", when="@1.9:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
 
+    depends_on("py-botocore@1.34.44:1.34", when="@1.34", type=("build", "run"))
     depends_on("py-botocore@1.29.26:1.29", when="@1.26", type=("build", "run"))
     depends_on("py-botocore@1.28.5:1.28", when="@1.25", type=("build", "run"))
     depends_on("py-botocore@1.27.96:1.27", when="@1.24", type=("build", "run"))
@@ -52,7 +54,12 @@ class PyBoto3(PythonPackage):
     depends_on("py-jmespath@0.7.1:0", when="@:1.20", type=("build", "run"))
     depends_on("py-jmespath@0.7.1:1", type=("build", "run"))
 
-    depends_on("py-s3transfer@0.6", when="@1.24:", type=("build", "run"))
+    depends_on("py-s3transfer@0.10", when="@1.34.6:", type=("build", "run"))
+    depends_on("py-s3transfer@0.9", when="@1.34:1.34.5", type=("build", "run"))
+    depends_on("py-s3transfer@0.8.2:0.8", when="@1.33.4:1.33", type=("build", "run"))
+    depends_on("py-s3transfer@0.8", when="@1.29.7:1.33.3", type=("build", "run"))
+    depends_on("py-s3transfer@0.7", when="@1.28.55:1.29.6", type=("build", "run"))
+    depends_on("py-s3transfer@0.6", when="@1.24:1.28.54", type=("build", "run"))
     depends_on("py-s3transfer@0.5", when="@1.18:1.23", type=("build", "run"))
     depends_on("py-s3transfer@0.3", when="@1.17", type=("build", "run"))
     depends_on("py-s3transfer@0.2", when="@:1.10", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-botocore/package.py b/var/spack/repos/builtin/packages/py-botocore/package.py
index feca4380de..d362b37302 100644
--- a/var/spack/repos/builtin/packages/py-botocore/package.py
+++ b/var/spack/repos/builtin/packages/py-botocore/package.py
@@ -12,6 +12,7 @@ class PyBotocore(PythonPackage):
     homepage = "https://github.com/boto/botocore"
     pypi = "botocore/botocore-1.13.44.tar.gz"
 
+    version("1.34.44", sha256="b0f40c54477e8e0a5c43377a927b8959a86bb8824aaef2d28db7c9c367cdefaa")
     version("1.31.41", sha256="4dad7c5a5e70940de54ebf8de3955450c1f092f43cacff8103819d1e7d5374fa")
     version("1.29.84", sha256="a36f7f6f8eae5dbd4a1cc8cb6fc747f6315500541181eff2093ee0529fc8e4bc")
     version("1.29.76", sha256="c2f67b6b3f8acf2968eafca06526f07b9fb0d27bac4c68a635d51abb675134a7")
@@ -45,4 +46,6 @@ class PyBotocore(PythonPackage):
     depends_on("py-urllib3@1.20:1.25", type=("build", "run"), when="@:1.14.11")
     depends_on("py-urllib3@1.20:1.25", type=("build", "run"), when="@1.14.12:1.18")
     depends_on("py-urllib3@1.25.4:1.25", type=("build", "run"), when="@1.19.0:1.19.15")
-    depends_on("py-urllib3@1.25.4:1.26", type=("build", "run"), when="@1.19.16:")
+    depends_on("py-urllib3@1.25.4:1.26", type=("build", "run"), when="@1.19.16:1.31.61")
+    depends_on("py-urllib3@1.25.4:1.26", type=("build", "run"), when="@1.31.62: ^python@:3.9")
+    depends_on("py-urllib3@1.25.4:2.0", type=("build", "run"), when="@1.31.62: ^python@3.10:")
diff --git a/var/spack/repos/builtin/packages/py-s3transfer/package.py b/var/spack/repos/builtin/packages/py-s3transfer/package.py
index 742340122a..27359867f3 100644
--- a/var/spack/repos/builtin/packages/py-s3transfer/package.py
+++ b/var/spack/repos/builtin/packages/py-s3transfer/package.py
@@ -12,13 +12,13 @@ class PyS3transfer(PythonPackage):
     homepage = "https://github.com/boto/s3transfer"
     pypi = "s3transfer/s3transfer-0.2.1.tar.gz"
 
-    depends_on("python@3.7:", when="@0.6.0:", type=("build", "run"))
-    depends_on("python@3.6:", when="@0.5.0:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.6:", when="@0.4.2", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.4:", when="@0.3.4", type=("build", "run"))
-
     license("Apache-2.0")
 
+    version("0.10.0", sha256="d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b")
+    version("0.9.0", sha256="9e1b186ec8bb5907a1e82b51237091889a9973a2bb799a924bcd9f301ff79d3d")
+    version("0.8.2", sha256="368ac6876a9e9ed91f6bc86581e319be08188dc60d50e0d56308ed5765446283")
+    version("0.7.0", sha256="fd3889a66f5fe17299fe75b82eae6cf722554edca744ca5d5fe308b104883d2e")
+    version("0.6.2", sha256="cab66d3380cca3e70939ef2255d01cd8aece6a4907a9528740f668c4b0611861")
     version("0.6.0", sha256="2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947")
     version("0.5.0", sha256="50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c")
     version("0.4.2", sha256="cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2")
@@ -26,4 +26,7 @@ class PyS3transfer(PythonPackage):
     version("0.2.1", sha256="6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d")
 
     depends_on("py-setuptools", type="build")
+
+    depends_on("py-botocore@1.33.2:1", type=("build", "run"), when="@0.8.1:")
+    depends_on("py-botocore@1.32.7:1", type=("build", "run"), when="@0.8.0:")
     depends_on("py-botocore@1.12.36:1", type=("build", "run"))
-- 
cgit v1.2.3-70-g09d2