From ac3b541515620e87ea7c7d22531bab3bff1a39b2 Mon Sep 17 00:00:00 2001 From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:03:08 +0200 Subject: [PATCH 1/2] relax `botocore` dependency specification --- CHANGES.rst | 4 ++++ aiobotocore/__init__.py | 2 +- pyproject.toml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 57f0b0d9..85a638bd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,10 @@ Changes ------- +2.14.1 (2024-09-10) +^^^^^^^^^^^^^^^^^^^ +* relax botocore dependency specification + 2.14.0 (2024-08-28) ^^^^^^^^^^^^^^^^^^^ * bump botocore dependency specification diff --git a/aiobotocore/__init__.py b/aiobotocore/__init__.py index 6684d2b8..5fd5f7b7 100644 --- a/aiobotocore/__init__.py +++ b/aiobotocore/__init__.py @@ -1 +1 @@ -__version__ = '2.14.0' +__version__ = '2.14.1' diff --git a/pyproject.toml b/pyproject.toml index 79e5349a..8a1ba879 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dynamic = ["version", "readme"] dependencies = [ - "botocore >=1.35.0, <1.35.8", # NOTE: When updating, always keep `project.optional-dependencies` aligned + "botocore >=1.35.0, <1.35.16", # NOTE: When updating, always keep `project.optional-dependencies` aligned "aiohttp >=3.9.2, <4.0.0", "wrapt >=1.10.10, <2.0.0", "aioitertools >=0.5.1, <1.0.0", @@ -37,10 +37,10 @@ dependencies = [ [project.optional-dependencies] awscli = [ - "awscli >=1.34.0, <1.34.8", + "awscli >=1.34.0, <1.34.16", ] boto3 = [ - "boto3 >=1.35.0, <1.35.8", + "boto3 >=1.35.0, <1.35.16", ] [project.urls] From 8a50b61c45674a0c1edf9507caf094723c9aad4b Mon Sep 17 00:00:00 2001 From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:14:40 +0200 Subject: [PATCH 2/2] bump `botocore` dependency specification --- CHANGES.rst | 4 ++-- aiobotocore/__init__.py | 2 +- aiobotocore/endpoint.py | 9 +++++++++ pyproject.toml | 6 +++--- tests/test_patches.py | 3 +-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 85a638bd..e9e39ac7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,9 +1,9 @@ Changes ------- -2.14.1 (2024-09-10) +2.15.0 (2024-09-10) ^^^^^^^^^^^^^^^^^^^ -* relax botocore dependency specification +* bump botocore dependency specification 2.14.0 (2024-08-28) ^^^^^^^^^^^^^^^^^^^ diff --git a/aiobotocore/__init__.py b/aiobotocore/__init__.py index 5fd5f7b7..754dd42c 100644 --- a/aiobotocore/__init__.py +++ b/aiobotocore/__init__.py @@ -1 +1 @@ -__version__ = '2.14.1' +__version__ = '2.15.0' diff --git a/aiobotocore/endpoint.py b/aiobotocore/endpoint.py index 1956f86d..33a2bcf4 100644 --- a/aiobotocore/endpoint.py +++ b/aiobotocore/endpoint.py @@ -205,6 +205,13 @@ async def _do_get_response(self, request, operation_model, context): history_recorder.record('HTTP_RESPONSE', http_response_record_dict) protocol = operation_model.metadata['protocol'] + customized_response_dict = {} + await self._event_emitter.emit( + f"before-parse.{service_id}.{operation_model.name}", + operation_model=operation_model, + response_dict=response_dict, + customized_response_dict=customized_response_dict, + ) parser = self._response_parser_factory.create_parser(protocol) if asyncio.iscoroutinefunction(parser.parse): @@ -216,6 +223,8 @@ async def _do_get_response(self, request, operation_model, context): response_dict, operation_model.output_shape ) + parsed_response.update(customized_response_dict) + if http_response.status_code >= 300: await self._add_modeled_error_fields( response_dict, diff --git a/pyproject.toml b/pyproject.toml index 8a1ba879..04fb3320 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dynamic = ["version", "readme"] dependencies = [ - "botocore >=1.35.0, <1.35.16", # NOTE: When updating, always keep `project.optional-dependencies` aligned + "botocore >=1.35.16, <1.35.17", # NOTE: When updating, always keep `project.optional-dependencies` aligned "aiohttp >=3.9.2, <4.0.0", "wrapt >=1.10.10, <2.0.0", "aioitertools >=0.5.1, <1.0.0", @@ -37,10 +37,10 @@ dependencies = [ [project.optional-dependencies] awscli = [ - "awscli >=1.34.0, <1.34.16", + "awscli >=1.34.16, <1.34.17", ] boto3 = [ - "boto3 >=1.35.0, <1.35.16", + "boto3 >=1.35.16, <1.35.17", ] [project.urls] diff --git a/tests/test_patches.py b/tests/test_patches.py index a68f26d4..1652be73 100644 --- a/tests/test_patches.py +++ b/tests/test_patches.py @@ -361,8 +361,7 @@ }, Endpoint._get_response: {'bbf10e6e07147d50e09d7205bf0883bd673a8bf3'}, Endpoint._do_get_response: { - '5afcfe76196406903afb24e05e3dd0feeac1a23d', - '4a1cab721ecf2777419ba070c38db77ae3b6df1e', + 'abad88892d61b22f2a6decffba2e40d070ba9f38', }, Endpoint._needs_retry: {'f718e2ff874763a677648fe6f87cc65e4cec2792'}, Endpoint._send: {'644c7e5bb88fecaa0b2a204411f8c7e69cc90bf1'},