Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support up-to-date botocore #1136

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changes
-------

2.14.0 (2024-08-23)
^^^^^^^^^^^^^^^^^^^
* bump botocore dependency specification

2.13.3 (2024-08-22)
^^^^^^^^^^^^^^^^^^^
* fix ``create_waiter_with_client()``
Expand Down
2 changes: 1 addition & 1 deletion aiobotocore/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.13.3'
__version__ = '2.14.0'
15 changes: 11 additions & 4 deletions aiobotocore/client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from botocore.auth import resolve_auth_type
from botocore.awsrequest import prepare_request_dict
from botocore.client import (
BaseClient,
Expand Down Expand Up @@ -64,15 +65,19 @@ async def create_client(
region_name, client_config = self._normalize_fips_region(
region_name, client_config
)
if auth := service_model.metadata.get('auth'):
service_signature_version = resolve_auth_type(auth)
else:
service_signature_version = service_model.metadata.get(
'signatureVersion'
)
endpoint_bridge = ClientEndpointBridge(
self._endpoint_resolver,
scoped_config,
client_config,
service_signing_name=service_model.metadata.get('signingName'),
config_store=self._config_store,
service_signature_version=service_model.metadata.get(
'signatureVersion'
),
service_signature_version=service_signature_version,
)
client_args = self._get_client_args(
service_model,
Expand Down Expand Up @@ -341,8 +346,10 @@ async def _make_api_call(self, operation_name, api_params):
'client_region': self.meta.region_name,
'client_config': self.meta.config,
'has_streaming_input': operation_model.has_streaming_input,
'auth_type': operation_model.auth_type,
'auth_type': operation_model.resolved_auth_type,
'unsigned_payload': operation_model.unsigned_payload,
}

api_params = await self._emit_api_params(
api_params=api_params,
operation_model=operation_model,
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ classifiers = [
dynamic = ["version", "readme"]

dependencies = [
"botocore >=1.34.70, <1.34.163", # NOTE: When updating, always keep `project.optional-dependencies` aligned
"botocore >=1.35.0, <1.35.5", # 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",
]

[project.optional-dependencies]
awscli = [
"awscli >=1.32.70, <1.33.45",
jakob-keller marked this conversation as resolved.
Show resolved Hide resolved
"awscli >=1.34.0, <1.34.5",
]
boto3 = [
"boto3 >=1.34.70, <1.34.163",
"boto3 >=1.35.0, <1.35.5",
]

[project.urls]
Expand Down
7 changes: 3 additions & 4 deletions tests/test_patches.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
},
# client.py
ClientCreator.create_client: {
'eeb7c4730ac86aec37de53b2be0779490b05f50b',
'e5bfb3213dc625a3c96e13ca7514f1ca7fc18899',
},
ClientCreator._create_client_class: {
'fcecaf8d4f2c1ac3c5d0eb50c573233ef86d641d',
Expand Down Expand Up @@ -178,8 +178,7 @@
'06864c8ecac153fa36d9d57f0057cb95909ee7cd',
},
BaseClient._make_api_call: {
'2cb11088d36a89cf9f5c41508bce908acbde24c4',
'490a95d7f829ce1fc2e3fbb6169ee63f04d6aeeb',
'fccb87670b86bd0bd834d5c38b74e1d77211590a',
},
BaseClient._make_request: {
'cfd8bbf19ea132134717cdf9c460694ddacdbf58',
Expand All @@ -203,7 +202,7 @@
# config.py
Config.merge: {'c3dd8c3ffe0da86953ceba4a35267dfb79c6a2c8'},
Config: {
'9154efda503c21ab9aa048214ddca7aa637e2ff9',
'823f8d031fc7218a600a56268a369aaa878f46c8',
},
# credentials.py
create_mfa_serial_refresher: {'9b5e98782fcacdcea5899a6d0d29d1b9de348bb0'},
Expand Down