Skip to content

Commit

Permalink
Support up-to-date botocore (#1091)
Browse files Browse the repository at this point in the history
* bump botocore dependency specification
  • Loading branch information
jakob-keller committed Feb 28, 2024
1 parent 6d40f07 commit a42d00b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changes
-------

2.12.0 (2024-02-28)
^^^^^^^^^^^^^^^^^^^
* bump botocore dependency specification

2.11.2 (2024-02-02)
^^^^^^^^^^^^^^^^^^^
* bump 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.11.2'
__version__ = '2.12.0'
6 changes: 3 additions & 3 deletions aiobotocore/credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,8 +914,7 @@ async def _retrieve_or_fail(self):
full_uri = self._fetcher.full_url(self._environ[self.ENV_VAR])
else:
full_uri = self._environ[self.ENV_VAR_FULL]
headers = self._build_headers()
fetcher = self._create_fetcher(full_uri, headers)
fetcher = self._create_fetcher(full_uri)
creds = await fetcher()
return AioRefreshableCredentials(
access_key=creds['access_key'],
Expand All @@ -926,9 +925,10 @@ async def _retrieve_or_fail(self):
refresh_using=fetcher,
)

def _create_fetcher(self, full_uri, headers):
def _create_fetcher(self, full_uri, *args, **kwargs):
async def fetch_creds():
try:
headers = self._build_headers()
response = await self._fetcher.retrieve_full_uri(
full_uri, headers=headers
)
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.33.2,<1.34.35',
'botocore>=1.34.41,<1.34.52',
'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.31.2,<1.32.35'],
'boto3': ['boto3>=1.33.2,<1.34.35'],
'awscli': ['awscli>=1.32.41,<1.32.52'],
'boto3': ['boto3>=1.34.41,<1.34.52'],
}


Expand Down
6 changes: 2 additions & 4 deletions tests/test_patches.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,9 @@
'f09731451ff6ba0645dc82e5c7948dfbf781e025',
},
BaseClient.get_paginator: {
'3531d5988aaaf0fbb3885044ccee1a693ec2608b',
'1c38079de68ccd43a5a06e36b1a47ec62233a7c2',
},
BaseClient.get_waiter: {
'44f0473d993d49ac7502984a7ccee3240b088404',
'4a4aeabe53af25d3737204187a31f930230864b4',
},
BaseClient.__getattr__: {'3ec17f468f50789fa633d6041f40b66a2f593e77'},
Expand Down Expand Up @@ -266,10 +264,10 @@
ContainerProvider.__init__: {'ea6aafb2e12730066af930fb5a27f7659c1736a1'},
ContainerProvider.load: {'57c35569050b45c1e9e33fcdb3b49da9e342fdcf'},
ContainerProvider._retrieve_or_fail: {
'7c14f1cdee07217f847a71068866bdd10c3fa0fa'
'c99153a4c68927810a3edde09ee98c5ba33d3697'
},
ContainerProvider._create_fetcher: {
'935ae28fdb1c76f419523d4030265f8c4d9d0b00'
'a921ee40b9b4779f238adcf369a3757b19857fc7'
},
InstanceMetadataProvider.load: {
'15becfc0373ccfbc1bb200bd6a34731e61561d06'
Expand Down

0 comments on commit a42d00b

Please sign in to comment.