Bump botocore dependency specification (#1374)

Author: jakob-keller

CHANGES.rst

@@ -1,6 +1,10 @@
 Changes
 -------
 
+2.23.1 (2025-06-15)
+^^^^^^^^^^^^^^^^^^^
+* bump botocore dependency specification
+
 2.23.0 (2025-06-12)
 ^^^^^^^^^^^^^^^^^^^
 * drop support for Python 3.8 (EOL)

aiobotocore/__init__.py

@@ -1 +1 @@
-__version__ = '2.23.0'
+__version__ = '2.23.1'

aiobotocore/client.py

@@ -13,6 +13,7 @@
 from botocore.exceptions import OperationNotPageableError, UnknownServiceError
 from botocore.history import get_global_history_recorder
 from botocore.hooks import first_non_none_response
+from botocore.useragent import register_feature_id
 from botocore.utils import get_service_module_name
 from botocore.waiter import xform_name
 
@@ -157,6 +158,9 @@ def _register_retries(self, client):
             self._register_v2_adaptive_retries(client)
         elif retry_mode == 'legacy':
             self._register_legacy_retries(client)
+        else:
+            return
+        register_feature_id(f'RETRY_MODE_{retry_mode.upper()}')
 
     def _register_v2_standard_retries(self, client):
         max_attempts = client.meta.config.retries.get('total_max_attempts')

aiobotocore/endpoint.py

@@ -225,7 +225,7 @@ async def _do_get_response(self, request, operation_model, context):
         )
         history_recorder.record('HTTP_RESPONSE', http_response_record_dict)
 
-        protocol = operation_model.metadata['protocol']
+        protocol = operation_model.service_model.resolved_protocol
         customized_response_dict = {}
         await self._event_emitter.emit(
             f"before-parse.{service_id}.{operation_model.name}",

aiobotocore/response.py

@@ -180,7 +180,7 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
 
 
 async def get_response(operation_model, http_response):
-    protocol = operation_model.metadata['protocol']
+    protocol = operation_model.service_model.resolved_protocol
     response_dict = {
         'headers': http_response.headers,
         'status_code': http_response.status_code,

pyproject.toml

@@ -31,7 +31,7 @@ dynamic = ["version", "readme"]
 dependencies = [
     "aiohttp >= 3.9.2, < 4.0.0",
     "aioitertools >= 0.5.1, < 1.0.0",
-    "botocore >= 1.38.23, < 1.38.28", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.38.31, < 1.38.37", # 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",
@@ -40,10 +40,10 @@ dependencies = [
 
 [project.optional-dependencies]
 awscli = [
-    "awscli >= 1.40.22, < 1.40.27",
+    "awscli >= 1.40.30, < 1.40.36",
 ]
 boto3 = [
-    "boto3 >= 1.38.23, < 1.38.28",
+    "boto3 >= 1.38.31, < 1.38.37",
 ]
 httpx = [
     "httpx >= 0.25.1, < 0.29"
@@ -58,7 +58,7 @@ botocore-dev = [
     # keep in sync with https://github.com/boto/botocore/blob/develop/requirements-dev.txt
     # "wheel==0.43.0",
     # "behave==1.2.5",
-    # "jsonschema==4.21.1",
+    # "jsonschema==4.23.0",
     "coverage==7.2.7",
     # "setuptools==71.1.0;python_version>='3.12'",
     # "packaging==24.1;python_version>='3.12'", # Requirement for setuptools>=71

tests/botocore_tests/unit/__init__.py

@@ -0,0 +1,42 @@
+# Copyright (c) 2012-2013 Mitch Garnaat http://garnaat.org/
+# Copyright 2012-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+import copy
+
+
+class BaseResponseTest:
+    def assert_response_with_subset_metadata(
+        self, actual_response, expected_response
+    ):
+        """
+        Compares two parsed service responses. For ResponseMetadata, it will
+        only assert that the expected is a proper subset of the actual. This
+        is useful so that when new keys are added to the metadata, tests don't
+        break.
+        """
+        actual = copy.copy(actual_response)
+        expected = copy.copy(expected_response)
+
+        actual_metadata = actual.pop('ResponseMetadata', {})
+        expected_metadata = expected.pop('ResponseMetadata', {})
+
+        assert actual == expected
+        self.assert_dict_is_proper_subset(actual_metadata, expected_metadata)
+
+    def assert_dict_is_proper_subset(self, superset, subset):
+        """
+        Asserts that a dictionary is a proper subset of another.
+        """
+        assert all(
+            (k in superset and superset[k] == v) for k, v in subset.items()
+        )

tests/botocore_tests/unit/test_response.py

@@ -0,0 +1,171 @@
+# Copyright 2012-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+import datetime
+from io import BytesIO
+
+from dateutil.tz import tzutc
+
+from aiobotocore import response
+from aiobotocore.awsrequest import AioAWSResponse
+from tests.botocore_tests.unit import BaseResponseTest
+
+XMLBODY1 = (
+    b'<?xml version="1.0" encoding="UTF-8"?><Error>'
+    b'<Code>AccessDenied</Code>'
+    b'<Message>Access Denied</Message>'
+    b'<RequestId>XXXXXXXXXXXXXXXX</RequestId>'
+    b'<HostId>AAAAAAAAAAAAAAAAAAA</HostId>'
+    b'</Error>'
+)
+
+XMLBODY2 = (
+    b'<?xml version="1.0" encoding="UTF-8"?>'
+    b'<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">'
+    b'<Name>mybucket</Name><Prefix></Prefix><Marker></Marker>'
+    b'<MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated>'
+    b'<Contents><Key>test.png</Key><LastModified>2014-03-01T17:06:40.000Z</LastModified>'
+    b'<ETag>&quot;00000000000000000000000000000000&quot;</ETag><Size>6702</Size>'
+    b'<Owner><ID>AAAAAAAAAAAAAAAAAAA</ID>'
+    b'<DisplayName>dummy</DisplayName></Owner>'
+    b'<StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+)
+
+
+class FakeRawResponse(BytesIO):
+    async def read(self, amt=-1):
+        if amt == -1:  # aiohttp to regular response
+            amt = None
+        return super().read(amt)
+
+
+class TestGetResponse(BaseResponseTest):
+    maxDiff = None
+
+    async def test_get_response_streaming_ok(self, session):
+        headers = {
+            'content-type': 'image/png',
+            'server': 'AmazonS3',
+            'AcceptRanges': 'bytes',
+            'transfer-encoding': 'chunked',
+            'ETag': '"00000000000000000000000000000000"',
+        }
+        raw = FakeRawResponse(b'\x89PNG\r\n\x1a\n\x00\x00')
+
+        http_response = AioAWSResponse(None, 200, headers, raw)
+
+        service_model = await session.get_service_model('s3')
+        operation_model = service_model.operation_model('GetObject')
+
+        res = await response.get_response(operation_model, http_response)
+        assert isinstance(res[1]['Body'], response.StreamingBody)
+        assert res[1]['ETag'] == '"00000000000000000000000000000000"'
+
+    async def test_get_response_streaming_ng(self, session):
+        headers = {
+            'content-type': 'application/xml',
+            'date': 'Sat, 08 Mar 2014 12:05:44 GMT',
+            'server': 'AmazonS3',
+            'transfer-encoding': 'chunked',
+            'x-amz-id-2': 'AAAAAAAAAAAAAAAAAAA',
+            'x-amz-request-id': 'XXXXXXXXXXXXXXXX',
+        }
+        raw = FakeRawResponse(XMLBODY1)
+        http_response = AioAWSResponse(None, 403, headers, raw)
+
+        service_model = await session.get_service_model('s3')
+        operation_model = service_model.operation_model('GetObject')
+
+        self.assert_response_with_subset_metadata(
+            (await response.get_response(operation_model, http_response))[1],
+            {
+                'Error': {'Message': 'Access Denied', 'Code': 'AccessDenied'},
+                'ResponseMetadata': {
+                    'HostId': 'AAAAAAAAAAAAAAAAAAA',
+                    'RequestId': 'XXXXXXXXXXXXXXXX',
+                    'HTTPStatusCode': 403,
+                },
+            },
+        )
+
+    async def test_get_response_nonstreaming_ok(self, session):
+        headers = {
+            'content-type': 'application/xml',
+            'date': 'Sun, 09 Mar 2014 02:55:43 GMT',
+            'server': 'AmazonS3',
+            'transfer-encoding': 'chunked',
+            'x-amz-id-2': 'AAAAAAAAAAAAAAAAAAA',
+            'x-amz-request-id': 'XXXXXXXXXXXXXXXX',
+        }
+        raw = FakeRawResponse(XMLBODY1)
+        http_response = AioAWSResponse(None, 403, headers, raw)
+
+        service_model = await session.get_service_model('s3')
+        operation_model = service_model.operation_model('ListObjects')
+
+        self.assert_response_with_subset_metadata(
+            (await response.get_response(operation_model, http_response))[1],
+            {
+                'ResponseMetadata': {
+                    'RequestId': 'XXXXXXXXXXXXXXXX',
+                    'HostId': 'AAAAAAAAAAAAAAAAAAA',
+                    'HTTPStatusCode': 403,
+                },
+                'Error': {'Message': 'Access Denied', 'Code': 'AccessDenied'},
+            },
+        )
+
+    async def test_get_response_nonstreaming_ng(self, session):
+        headers = {
+            'content-type': 'application/xml',
+            'date': 'Sat, 08 Mar 2014 12:05:44 GMT',
+            'server': 'AmazonS3',
+            'transfer-encoding': 'chunked',
+            'x-amz-id-2': 'AAAAAAAAAAAAAAAAAAA',
+            'x-amz-request-id': 'XXXXXXXXXXXXXXXX',
+        }
+        raw = FakeRawResponse(XMLBODY2)
+        http_response = AioAWSResponse(None, 200, headers, raw)
+
+        service_model = await session.get_service_model('s3')
+        operation_model = service_model.operation_model('ListObjects')
+
+        self.assert_response_with_subset_metadata(
+            (await response.get_response(operation_model, http_response))[1],
+            {
+                'Contents': [
+                    {
+                        'ETag': '"00000000000000000000000000000000"',
+                        'Key': 'test.png',
+                        'LastModified': datetime.datetime(
+                            2014, 3, 1, 17, 6, 40, tzinfo=tzutc()
+                        ),
+                        'Owner': {
+                            'DisplayName': 'dummy',
+                            'ID': 'AAAAAAAAAAAAAAAAAAA',
+                        },
+                        'Size': 6702,
+                        'StorageClass': 'STANDARD',
+                    }
+                ],
+                'IsTruncated': False,
+                'Marker': "",
+                'MaxKeys': 1000,
+                'Name': 'mybucket',
+                'Prefix': "",
+                'ResponseMetadata': {
+                    'RequestId': 'XXXXXXXXXXXXXXXX',
+                    'HostId': 'AAAAAAAAAAAAAAAAAAA',
+                    'HTTPStatusCode': 200,
+                },
+            },
+        )

tests/test_patches.py

@@ -216,7 +216,7 @@ def test_protocol_parsers():
         (
             ClientCreator._register_retries,
             {
-                '16d3064142e5f9e45b0094bbfabf7be30183f255',
+                'ceecfc40a4ffa83551d7e6f63fd5d17f820664b0',
             },
         ),
         (
@@ -701,7 +701,7 @@ def test_protocol_parsers():
         (
             Endpoint._do_get_response,
             {
-                'abad88892d61b22f2a6decffba2e40d070ba9f38',
+                'a9f3ae0f375ba9967425b1fb3e4d45537df4f1e3',
             },
         ),
         (
@@ -926,7 +926,7 @@ def test_protocol_parsers():
         (
             get_response,
             {
-                '6515f43730b546419695c26d4bc0d198fde54b10',
+                'ea8686ae71fae32410e2f1774e5774d6715dd492',
             },
         ),
         # session.py