Skip to content

Commit a2a236c

Browse files
authored
Bump botocore dependency specification (#1376)
1 parent cdbb852 commit a2a236c

File tree

14 files changed

+48
-52
lines changed

14 files changed

+48
-52
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,15 @@ ci:
66

77
repos:
88
- repo: 'https://github.com/pre-commit/pre-commit-hooks'
9-
rev: v4.5.0
9+
rev: v5.0.0
1010
hooks:
1111
- id: check-yaml
1212
- id: end-of-file-fixer
1313
- id: trailing-whitespace
14-
- repo: 'https://github.com/PyCQA/isort'
15-
rev: 5.12.0
16-
hooks:
17-
- id: isort
1814
- repo: https://github.com/astral-sh/ruff-pre-commit
19-
rev: v0.4.8
15+
rev: v0.12.0
2016
hooks:
21-
- id: ruff
17+
- id: ruff-check
2218
args: [--fix]
2319
- id: ruff-format
2420
- repo: https://github.com/astral-sh/uv-pre-commit

CHANGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Changes
22
-------
33

4-
2.23.1 (2025-06-15)
4+
2.23.1 (2025-07-16)
55
^^^^^^^^^^^^^^^^^^^
66
* bump botocore dependency specification
77

aiobotocore/paginate.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ async def __anext__(self):
9292
and previous_next_token == next_token
9393
):
9494
message = (
95-
f"The same next token was received "
96-
f"twice: {next_token}"
95+
f"The same next token was received twice: {next_token}"
9796
)
9897
raise PaginationError(message=message)
9998
self._inject_token_into_kwargs(current_kwargs, next_token)

aiobotocore/retries/bucket.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import asyncio
44

55
from botocore.exceptions import CapacityNotAvailableError
6-
76
from botocore.retries.bucket import Clock as Clock # reexport # noqa
87

98

aiobotocore/session.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
from botocore import UNSIGNED
1+
from botocore import UNSIGNED, translate
22
from botocore import __version__ as botocore_version
3-
from botocore import translate
43
from botocore.context import get_context
54
from botocore.exceptions import PartialCredentialsError
6-
from botocore.session import EVENT_ALIASES, ServiceModel
5+
from botocore.session import (
6+
EVENT_ALIASES,
7+
ServiceModel,
8+
UnknownServiceError,
9+
copy,
10+
logger,
11+
)
712
from botocore.session import Session as _SyncSession
8-
from botocore.session import UnknownServiceError, copy, logger
913

1014
from . import __version__, retryhandler
1115
from .client import AioBaseClient, AioClientCreator

aiobotocore/waiter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
from botocore.waiter import (
1010
NormalizedOperationMethod as _NormalizedOperationMethod,
1111
)
12-
from botocore.waiter import WaiterModel # noqa: F401 lgtm[py/unused-import]
1312
from botocore.waiter import (
1413
Waiter,
1514
WaiterError,
15+
WaiterModel, # noqa: F401 lgtm[py/unused-import]
1616
is_valid_waiter_error,
1717
logger,
1818
xform_name,
@@ -120,7 +120,7 @@ async def wait(self, **kwargs):
120120
)
121121
if current_state == 'success':
122122
logger.debug(
123-
"Waiting complete, waiter matched the " "success state."
123+
"Waiting complete, waiter matched the success state."
124124
)
125125
return response
126126
if current_state == 'failure':

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dynamic = ["version", "readme"]
3131
dependencies = [
3232
"aiohttp >= 3.9.2, < 4.0.0",
3333
"aioitertools >= 0.5.1, < 1.0.0",
34-
"botocore >= 1.38.31, < 1.38.37", # NOTE: When updating, always keep `project.optional-dependencies` aligned
34+
"botocore >= 1.38.40, < 1.38.47", # NOTE: When updating, always keep `project.optional-dependencies` aligned
3535
"python-dateutil >= 2.1, < 3.0.0",
3636
"jmespath >= 0.7.1, < 2.0.0",
3737
"multidict >= 6.0.0, < 7.0.0",
@@ -40,10 +40,10 @@ dependencies = [
4040

4141
[project.optional-dependencies]
4242
awscli = [
43-
"awscli >= 1.40.30, < 1.40.36",
43+
"awscli >= 1.40.39, < 1.40.46",
4444
]
4545
boto3 = [
46-
"boto3 >= 1.38.31, < 1.38.37",
46+
"boto3 >= 1.38.40, < 1.38.47",
4747
]
4848
httpx = [
4949
"httpx >= 0.25.1, < 0.29"
@@ -153,7 +153,7 @@ target-version = "py39"
153153
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
154154
# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
155155
# McCabe complexity (`C901`) by default.
156-
select = ["E4", "E7", "E9", "F", "UP"]
156+
select = ["E4", "E7", "E9", "F", "I", "UP"]
157157
ignore = []
158158

159159
# Allow fix for all enabled rules (when `--fix`) is provided.

tests/botocore_tests/unit/test_credentials.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,7 @@ async def test_processprovider_bad_config(process_provider):
19881988

19891989
async def test_session_credentials():
19901990
with mock.patch(
1991-
'aiobotocore.credentials.AioCredential' 'Resolver.load_credentials'
1991+
'aiobotocore.credentials.AioCredentialResolver.load_credentials'
19921992
) as mock_obj:
19931993
mock_obj.return_value = 'somecreds'
19941994

tests/botocore_tests/unit/test_httpchecksum.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ async def test_single_chunk_body(self):
409409
bytes = BytesIO(b"abcdefghijklmnopqrstuvwxyz")
410410
wrapper = AioAwsChunkedWrapper(bytes)
411411
body = await wrapper.read()
412-
expected = b"1a\r\n" b"abcdefghijklmnopqrstuvwxyz\r\n" b"0\r\n\r\n"
412+
expected = b"1a\r\nabcdefghijklmnopqrstuvwxyz\r\n0\r\n\r\n"
413413
assert body == expected
414414

415415
async def test_multi_chunk_body(self):
@@ -425,7 +425,7 @@ async def test_multi_chunk_body(self):
425425
b"6\r\n"
426426
b"uvwxyz\r\n"
427427
b"0\r\n\r\n"
428-
)
428+
) # fmt: skip
429429
assert body == expected
430430

431431
async def test_read_returns_less_data(self):
@@ -449,7 +449,7 @@ def read(self, size=-1):
449449
b"8\r\n"
450450
b"stuvwxyz\r\n"
451451
b"0\r\n\r\n"
452-
)
452+
) # fmt: skip
453453
assert body == expected
454454

455455
async def test_single_chunk_body_with_checksum(self):
@@ -459,9 +459,7 @@ async def test_single_chunk_body_with_checksum(self):
459459
checksum_name="checksum",
460460
)
461461
body = await wrapper.read()
462-
expected = (
463-
b"b\r\n" b"hello world\r\n" b"0\r\n" b"checksum:DUoRhQ==\r\n\r\n"
464-
)
462+
expected = b"b\r\nhello world\r\n0\r\nchecksum:DUoRhQ==\r\n\r\n"
465463
assert body == expected
466464

467465
async def test_multi_chunk_body_with_checksum(self):

tests/botocore_tests/unit/test_session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ async def test_create_client_uses_api_version_from_config(
371371
f.write(
372372
'foo_api_versions =\n'
373373
f' myservice = {config_api_version}\n'
374-
)
374+
) # fmt: skip
375375
f.flush()
376376

377377
async with session.create_client('myservice', 'us-west-2'):
@@ -422,7 +422,7 @@ async def test_param_api_version_overrides_config_value(
422422
f.write(
423423
'foo_api_versions =\n'
424424
f' myservice = {config_api_version}\n'
425-
)
425+
) # fmt: skip
426426
f.flush()
427427

428428
async with session.create_client(

0 commit comments

Comments
 (0)