Bump botocore dependency specification (#1292)

Author: jakob-keller

CHANGES.rst

@@ -1,9 +1,10 @@
 Changes
 -------
 
-2.20.0 (2025-02-13)
+2.20.0 (2025-02-19)
 ^^^^^^^^^^^^^^^^^^^
 * patch `AwsChunkedWrapper.read`
+* bump botocore dependency specification
 
 2.19.0 (2025-01-22)
 ^^^^^^^^^^^^^^^^^^^

aiobotocore/httpchecksum.py

@@ -6,6 +6,7 @@
     FlexibleChecksumError,
     _apply_request_header_checksum,
     base64,
+    conditionally_calculate_md5,
     determine_content_length,
     logger,
 )
@@ -129,7 +130,7 @@ async def handle_checksum_body(
         response["context"]["checksum"] = checksum_context
         return
 
-    logger.info(
+    logger.debug(
         f'Skipping checksum validation. Response did not contain one of the '
         f'following algorithms: {algorithms}.'
     )
@@ -169,7 +170,10 @@ def apply_request_checksum(request):
     if not algorithm:
         return
 
-    if algorithm["in"] == "header":
+    if algorithm == "conditional-md5":
+        # Special case to handle the http checksum required trait
+        conditionally_calculate_md5(request)
+    elif algorithm["in"] == "header":
         _apply_request_header_checksum(request)
     elif algorithm["in"] == "trailer":
         _apply_request_trailer_checksum(request)
@@ -213,6 +217,12 @@ def _apply_request_trailer_checksum(request):
         # services such as S3 may require the decoded content length
         headers["X-Amz-Decoded-Content-Length"] = str(content_length)
 
+        if "Content-Length" in headers:
+            del headers["Content-Length"]
+            logger.debug(
+                "Removing the Content-Length header since 'chunked' is specified for Transfer-Encoding."
+            )
+
     if isinstance(body, (bytes, bytearray)):
         body = io.BytesIO(body)
 

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.36.0, < 1.36.4", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.36.20, < 1.36.24", # 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.37.0, < 1.37.4",
+    "awscli >= 1.37.20, < 1.37.24",
 ]
 boto3 = [
-    "boto3 >= 1.36.0, < 1.36.4",
+    "boto3 >= 1.36.20, < 1.36.24",
 ]
 
 [project.urls]

tests/boto_tests/unit/test_eventstream.py

@@ -23,7 +23,6 @@
     EventStreamHeaderParser,
     EventStreamMessage,
     InvalidHeadersLength,
-    InvalidPayloadLength,
     MessagePrelude,
     NoInitialResponseError,
 )
@@ -262,17 +261,6 @@
     InvalidHeadersLength,
 )
 
-# In contrast to the CORRUPTED_PAYLOAD case, this message is otherwise
-# well-formed - the checksums match.
-INVALID_PAYLOAD_LENGTH = (
-    b"\x01\x00\x00\x11"  # total length
-    + b"\x00\x00\x00\x00"  # headers length
-    + b"\xf4\x08\x61\xc5"  # prelude crc
-    + b"0" * (16 * 1024**2 + 1)  # payload
-    + b"\x2a\xb4\xc5\xa5",  # message crc
-    InvalidPayloadLength,
-)
-
 # Tuples of encoded messages and their expected exception
 NEGATIVE_CASES = [
     CORRUPTED_LENGTH,
@@ -281,7 +269,6 @@
     CORRUPTED_HEADER_LENGTH,
     DUPLICATE_HEADER,
     INVALID_HEADERS_LENGTH,
-    INVALID_PAYLOAD_LENGTH,
 ]
 
 
@@ -349,7 +336,6 @@ def test_all_positive_cases():
         "corrupted-headers-length",
         "duplicate-headers",
         "invalid-headers-length",
-        "invalid-payload-length",
     ],
 )
 def test_negative_cases(encoded, exception):

tests/test_patches.py

@@ -696,8 +696,7 @@
     AWSResponse.text: {'a724100ba9f6d51b333b8fe470fac46376d5044a'},
     # httpchecksum.py
     handle_checksum_body: {
-        '898cee7a7a5e5a02af7e0e65dcbb8122257b85df',
-        '6f15cc120818413e89aac088d130c729ba3d422c',
+        '040cb48d8ebfb5ca195d41deb55b38d1fcb489f8',
     },
     _handle_streaming_response: {
         '7ce971e012f9d4b04889f0af83f67281ed6a9e6e',
@@ -718,10 +717,10 @@
     },
     AwsChunkedWrapper.__iter__: {'261e26d1061655555fe3dcb2689d963e43f80fb0'},
     apply_request_checksum: {
-        '94f2d201a07a3831fd55d8ca2f2d75cdb06a9514',
+        '6d904d118cd9d768935e38a60a73a46c67a8d440',
     },
     _apply_request_trailer_checksum: {
-        '28cdf19282be7cd2c99a734831ec4f489648bcc7'
+        '45f483dd8520bf67616a063bdf6386865aad3591',
     },
     # retryhandler.py
     retryhandler.create_retry_handler: {