Merge pull request #1265 from jakob-keller/bump-botocore

Bump `botocore` dependency specification

Author: jakob-keller

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     args: [--fix]
   - id: ruff-format
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.5.15
+  rev: 0.5.20
   hooks:
   - id: uv-lock
 - repo: https://github.com/adrienverge/yamllint

CHANGES.rst

@@ -1,6 +1,10 @@
 Changes
 -------
 
+2.18.0 (2025-01-17)
+^^^^^^^^^^^^^^^^^^^
+* bump botocore dependency specification
+
 2.17.0 (2025-01-06)
 ^^^^^^^^^^^^^^^^^^^
 * relax botocore dependency specification

aiobotocore/__init__.py

@@ -1 +1 @@
-__version__ = '2.17.0'
+__version__ = '2.18.0'

aiobotocore/httpchecksum.py

@@ -6,7 +6,6 @@
     FlexibleChecksumError,
     _apply_request_header_checksum,
     base64,
-    conditionally_calculate_md5,
     determine_content_length,
     logger,
 )
@@ -145,17 +144,19 @@ def apply_request_checksum(request):
     if not algorithm:
         return
 
-    if algorithm == "conditional-md5":
-        # Special case to handle the http checksum required trait
-        conditionally_calculate_md5(request)
-    elif algorithm["in"] == "header":
+    if algorithm["in"] == "header":
         _apply_request_header_checksum(request)
     elif algorithm["in"] == "trailer":
         _apply_request_trailer_checksum(request)
     else:
         raise FlexibleChecksumError(
             error_msg="Unknown checksum variant: {}".format(algorithm["in"])
         )
+    if "request_algorithm_header" in checksum_context:
+        request_algorithm_header = checksum_context["request_algorithm_header"]
+        request["headers"][request_algorithm_header["name"]] = (
+            request_algorithm_header["value"]
+        )
 
 
 def _apply_request_trailer_checksum(request):

pyproject.toml

@@ -32,7 +32,7 @@ dynamic = ["version", "readme"]
 dependencies = [
     "aiohttp >= 3.9.2, < 4.0.0",
     "aioitertools >= 0.5.1, < 1.0.0",
-    "botocore >= 1.35.74, < 1.35.94", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.36.0, < 1.36.2", # NOTE: When updating, always keep `project.optional-dependencies` aligned
     "python-dateutil >= 2.1, < 3.0.0",
     "jmespath >= 0.7.1, < 2.0.0",
     "multidict >= 6.0.0, < 7.0.0",
@@ -43,10 +43,10 @@ dependencies = [
 
 [project.optional-dependencies]
 awscli = [
-    "awscli >= 1.36.15, < 1.36.35",
+    "awscli >= 1.37.0, < 1.37.2",
 ]
 boto3 = [
-    "boto3 >= 1.35.74, < 1.35.94",
+    "boto3 >= 1.36.0, < 1.36.2",
 ]
 
 [project.urls]
@@ -90,7 +90,7 @@ default-groups = [
     "botocore-dev",
     "dev",
 ]
-required-version = ">=0.5.14"
+required-version = ">=0.5.19"
 
 [tool.setuptools.dynamic]
 version = { attr = "aiobotocore.__version__" }

tests/test_patches.py

@@ -204,8 +204,7 @@
     # config.py
     Config.merge: {'c3dd8c3ffe0da86953ceba4a35267dfb79c6a2c8'},
     Config: {
-        '823f8d031fc7218a600a56268a369aaa878f46c8',
-        'b1bd1c2cb9a20afa98db306c803617543ffecbf4',
+        'b74583575a542516edeeeec2e5d30ee61ce449b0',
     },
     # credentials.py
     create_mfa_serial_refresher: {'9b5e98782fcacdcea5899a6d0d29d1b9de348bb0'},
@@ -716,8 +715,7 @@
     },
     AwsChunkedWrapper.__iter__: {'261e26d1061655555fe3dcb2689d963e43f80fb0'},
     apply_request_checksum: {
-        'bcc044f0655f30769994efab72b29e76d73f7e39',
-        '5ebac6a8f1475a6b42b356135bc5f5840ac07a55',
+        '94f2d201a07a3831fd55d8ca2f2d75cdb06a9514',
     },
     _apply_request_trailer_checksum: {
         '28cdf19282be7cd2c99a734831ec4f489648bcc7'