Skip to content

Commit

Permalink
Merge pull request #1265 from jakob-keller/bump-botocore
Browse files Browse the repository at this point in the history
Bump `botocore` dependency specification
  • Loading branch information
jakob-keller authored Jan 17, 2025
2 parents abfaae4 + 04d7296 commit ed34a55
Show file tree
Hide file tree
Showing 7 changed files with 162 additions and 124 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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
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.17.0'
__version__ = '2.18.0'
11 changes: 6 additions & 5 deletions aiobotocore/httpchecksum.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
FlexibleChecksumError,
_apply_request_header_checksum,
base64,
conditionally_calculate_md5,
determine_content_length,
logger,
)
Expand Down Expand Up @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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]
Expand Down Expand Up @@ -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__" }
Expand Down
6 changes: 2 additions & 4 deletions tests/test_patches.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,7 @@
# config.py
Config.merge: {'c3dd8c3ffe0da86953ceba4a35267dfb79c6a2c8'},
Config: {
'823f8d031fc7218a600a56268a369aaa878f46c8',
'b1bd1c2cb9a20afa98db306c803617543ffecbf4',
'b74583575a542516edeeeec2e5d30ee61ce449b0',
},
# credentials.py
create_mfa_serial_refresher: {'9b5e98782fcacdcea5899a6d0d29d1b9de348bb0'},
Expand Down Expand Up @@ -716,8 +715,7 @@
},
AwsChunkedWrapper.__iter__: {'261e26d1061655555fe3dcb2689d963e43f80fb0'},
apply_request_checksum: {
'bcc044f0655f30769994efab72b29e76d73f7e39',
'5ebac6a8f1475a6b42b356135bc5f5840ac07a55',
'94f2d201a07a3831fd55d8ca2f2d75cdb06a9514',
},
_apply_request_trailer_checksum: {
'28cdf19282be7cd2c99a734831ec4f489648bcc7'
Expand Down
253 changes: 144 additions & 109 deletions uv.lock

Large diffs are not rendered by default.

0 comments on commit ed34a55

Please sign in to comment.