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 and urllib3 2.0 #1037

Merged
merged 3 commits into from
Oct 17, 2023
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.7.1 (2023-10-17)
^^^^^^^^^^^^^^^^^^
* relax botocore dependency specification

2.7.0 (2023-08-17)
^^^^^^^^^^^^^^^^^^
* add support for Python 3.12
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.7.0'
__version__ = '2.7.1'
2 changes: 1 addition & 1 deletion requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ flake8-black~=0.3.3
flake8-isort~= 4.1.1
black~=22.6.0
isort~= 5.10.1
docker~=5.0.0
docker~=6.1.3
moto[server,s3,sqs,lambda,dynamodb,cloudformation,sns,batch,ec2,rds]~=4.0.0
pytest~=6.2.4
pytest-cov~=4.1.0
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
# NOTE: When updating botocore make sure to update awscli/boto3 versions below
install_requires = [
# pegged to also match items in `extras_require`
'botocore>=1.31.17,<1.31.18',
'botocore>=1.31.16,<1.31.65',
'aiohttp>=3.7.4.post0,<4.0.0',
'wrapt>=1.10.10, <2.0.0',
'aioitertools>=0.5.1,<1.0.0',
]

extras_require = {
'awscli': ['awscli>=1.29.17,<1.29.18'],
'boto3': ['boto3>=1.28.17,<1.28.18'],
'awscli': ['awscli>=1.29.16,<1.29.65'],
'boto3': ['boto3>=1.28.16,<1.28.65'],
}


Expand Down
11 changes: 9 additions & 2 deletions tests/test_patches.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,11 @@
BaseClient.__getattr__: {'3ec17f468f50789fa633d6041f40b66a2f593e77'},
# config.py
Config.merge: {'c3dd8c3ffe0da86953ceba4a35267dfb79c6a2c8'},
Config: {'4153fcb2ddf68b86f3774da1016b9cbfa1659b0b'},
Config: {
'4153fcb2ddf68b86f3774da1016b9cbfa1659b0b',
'c6b76ca9e061c4fee99be96fb716a49043eb1806',
'ef03037bbe22945d5aa83bf39854e758f1b0c768',
},
# credentials.py
create_mfa_serial_refresher: {'9b5e98782fcacdcea5899a6d0d29d1b9de348bb0'},
Credentials.get_frozen_credentials: {
Expand Down Expand Up @@ -554,7 +558,10 @@
'86946722d10a72b593483fca0abf30100c609178'
},
# httpsession.py
URLLib3Session: {'c72094afb3aa62db0ade9be09be72ec7a2c3d80a'},
URLLib3Session: {
'c72094afb3aa62db0ade9be09be72ec7a2c3d80a',
'1c418944abceb3a3d76c2c22348b4a39280d27ef',
},
EndpointDiscoveryHandler.discover_endpoint: {
'd87eff9008356a6aaa9b7078f23ba7a9ff0c7a60'
},
Expand Down
2 changes: 1 addition & 1 deletion tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def test_release_versions():
# get aioboto reqs
with (_root_path / 'setup.py').open() as f:
content = f.read()
aioboto_reqs = _get_boto_module_versions(content, True)
aioboto_reqs = _get_boto_module_versions(content, False)

# get awscli reqs
awscli_resp = requests.get(
Expand Down
Loading