From 2aba86aa1a34b981722074de98dbdfca0d99bee7 Mon Sep 17 00:00:00 2001 From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:07:37 +0200 Subject: [PATCH 1/3] relax botocore dependency specification --- CHANGES.rst | 4 ++++ aiobotocore/__init__.py | 2 +- setup.py | 6 +++--- tests/test_patches.py | 6 +++++- tests/test_version.py | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 826f03b3..0b23e213 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,10 @@ Changes ------- +2.7.1 (2023-10-09) +^^^^^^^^^^^^^^^^^^ +* relax botocore dependency specification + 2.7.0 (2023-08-17) ^^^^^^^^^^^^^^^^^^ * add support for Python 3.12 diff --git a/aiobotocore/__init__.py b/aiobotocore/__init__.py index 766ce2d0..e90ba7fa 100644 --- a/aiobotocore/__init__.py +++ b/aiobotocore/__init__.py @@ -1 +1 @@ -__version__ = '2.7.0' +__version__ = '2.7.1' diff --git a/setup.py b/setup.py index 8d3cd8f6..00f7291d 100644 --- a/setup.py +++ b/setup.py @@ -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.63', '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.63'], + 'boto3': ['boto3>=1.28.16,<1.28.63'], } diff --git a/tests/test_patches.py b/tests/test_patches.py index cddc6652..0e77fec6 100644 --- a/tests/test_patches.py +++ b/tests/test_patches.py @@ -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: { diff --git a/tests/test_version.py b/tests/test_version.py index 21055889..a490c299 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -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( From 724dd2889ba935096a52e414fa957e5f155afa70 Mon Sep 17 00:00:00 2001 From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:23:10 +0800 Subject: [PATCH 2/3] bump minimum docker-py --- requirements-dev.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.in b/requirements-dev.in index e18d5285..4e08c069 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -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 From f62c930a7db8808e6238be2b4f443a1934cc5d88 Mon Sep 17 00:00:00 2001 From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com> Date: Fri, 13 Oct 2023 09:44:33 +0800 Subject: [PATCH 3/3] relax botocore dependency specification --- CHANGES.rst | 2 +- setup.py | 6 +++--- tests/test_patches.py | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0b23e213..26bca55c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changes ------- -2.7.1 (2023-10-09) +2.7.1 (2023-10-17) ^^^^^^^^^^^^^^^^^^ * relax botocore dependency specification diff --git a/setup.py b/setup.py index 00f7291d..81b6edc1 100644 --- a/setup.py +++ b/setup.py @@ -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.16,<1.31.63', + '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.16,<1.29.63'], - 'boto3': ['boto3>=1.28.16,<1.28.63'], + 'awscli': ['awscli>=1.29.16,<1.29.65'], + 'boto3': ['boto3>=1.28.16,<1.28.65'], } diff --git a/tests/test_patches.py b/tests/test_patches.py index 0e77fec6..67dbf42c 100644 --- a/tests/test_patches.py +++ b/tests/test_patches.py @@ -558,7 +558,10 @@ '86946722d10a72b593483fca0abf30100c609178' }, # httpsession.py - URLLib3Session: {'c72094afb3aa62db0ade9be09be72ec7a2c3d80a'}, + URLLib3Session: { + 'c72094afb3aa62db0ade9be09be72ec7a2c3d80a', + '1c418944abceb3a3d76c2c22348b4a39280d27ef', + }, EndpointDiscoveryHandler.discover_endpoint: { 'd87eff9008356a6aaa9b7078f23ba7a9ff0c7a60' },