From a42d00b875c550b4e687c8c227ed3831d55297b9 Mon Sep 17 00:00:00 2001 From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com> Date: Wed, 28 Feb 2024 18:07:27 +0100 Subject: [PATCH 1/2] Support up-to-date `botocore` (#1091) * bump botocore dependency specification --- CHANGES.rst | 4 ++++ aiobotocore/__init__.py | 2 +- aiobotocore/credentials.py | 6 +++--- setup.py | 6 +++--- tests/test_patches.py | 6 ++---- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 04f4e65a..4d50e4b5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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 diff --git a/aiobotocore/__init__.py b/aiobotocore/__init__.py index ded7bd35..0b288f83 100644 --- a/aiobotocore/__init__.py +++ b/aiobotocore/__init__.py @@ -1 +1 @@ -__version__ = '2.11.2' +__version__ = '2.12.0' diff --git a/aiobotocore/credentials.py b/aiobotocore/credentials.py index b78d2158..885b71c8 100644 --- a/aiobotocore/credentials.py +++ b/aiobotocore/credentials.py @@ -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'], @@ -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 ) diff --git a/setup.py b/setup.py index 4d7fe28f..adf7feba 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.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'], } diff --git a/tests/test_patches.py b/tests/test_patches.py index 05d2569a..570fa495 100644 --- a/tests/test_patches.py +++ b/tests/test_patches.py @@ -185,11 +185,9 @@ 'f09731451ff6ba0645dc82e5c7948dfbf781e025', }, BaseClient.get_paginator: { - '3531d5988aaaf0fbb3885044ccee1a693ec2608b', '1c38079de68ccd43a5a06e36b1a47ec62233a7c2', }, BaseClient.get_waiter: { - '44f0473d993d49ac7502984a7ccee3240b088404', '4a4aeabe53af25d3737204187a31f930230864b4', }, BaseClient.__getattr__: {'3ec17f468f50789fa633d6041f40b66a2f593e77'}, @@ -266,10 +264,10 @@ ContainerProvider.__init__: {'ea6aafb2e12730066af930fb5a27f7659c1736a1'}, ContainerProvider.load: {'57c35569050b45c1e9e33fcdb3b49da9e342fdcf'}, ContainerProvider._retrieve_or_fail: { - '7c14f1cdee07217f847a71068866bdd10c3fa0fa' + 'c99153a4c68927810a3edde09ee98c5ba33d3697' }, ContainerProvider._create_fetcher: { - '935ae28fdb1c76f419523d4030265f8c4d9d0b00' + 'a921ee40b9b4779f238adcf369a3757b19857fc7' }, InstanceMetadataProvider.load: { '15becfc0373ccfbc1bb200bd6a34731e61561d06' From 1a1b2f8836780cd9a9e24bfdb478c7c7ebb35997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Wed, 28 Feb 2024 18:41:21 +0100 Subject: [PATCH 2/2] Fix RTD (#1094) * Fix RTD * Upgrade to more recent Sphinx --- .readthedocs.yml | 17 +++++++++++++++++ docs/conf.py | 6 +----- docs/examples/s3/basic_usage.rst | 3 ++- docs/requirements.txt | 2 +- readthedocs.yml | 11 ----------- 5 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 .readthedocs.yml delete mode 100644 readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 00000000..55b19858 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,17 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.8" + +sphinx: + configuration: docs/conf.py + +python: + install: + - requirements: docs/requirements.txt + +formats: + - htmlzip + - epub diff --git a/docs/conf.py b/docs/conf.py index f6ca032a..f70c81f2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -89,7 +89,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = "en" # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. @@ -123,10 +123,6 @@ 'github_type': 'star', 'github_banner': True, } -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] # -- Options for HTMLHelp output ------------------------------------------ diff --git a/docs/examples/s3/basic_usage.rst b/docs/examples/s3/basic_usage.rst index 3b8d4732..a9aeb496 100644 --- a/docs/examples/s3/basic_usage.rst +++ b/docs/examples/s3/basic_usage.rst @@ -1,5 +1,6 @@ Put, Get and Delete ------------ +------------------- + Simple put, get, delete example for S3 service: .. literalinclude:: ../../../examples/simple.py diff --git a/docs/requirements.txt b/docs/requirements.txt index 4f81946d..5388c883 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1 +1 @@ -sphinx==2.4.1 +sphinx==5.3.0 diff --git a/readthedocs.yml b/readthedocs.yml deleted file mode 100644 index 7a70b110..00000000 --- a/readthedocs.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: aiobotocore -type: sphinx -requirements_file: docs/requirements.txt -build: - image: latest -python: - version: 3.6 - setup_py_install: true -formats: - - htmlzip - - epub