From a96a9aacf3c50e5b80e6982db28e4c60c5744698 Mon Sep 17 00:00:00 2001 From: Can Yildirim <68567963+canopus1io@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:55:06 -0700 Subject: [PATCH 1/5] 4.x - fix for botocore 1.33.2 (based off Pull Request #1206 for 5.x branch) --- pynamodb/connection/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py index 2ef176751..d4a6516e3 100644 --- a/pynamodb/connection/base.py +++ b/pynamodb/connection/base.py @@ -375,9 +375,11 @@ def _make_api_call(self, operation_name, operation_kwargs): 'has_streaming_input': operation_model.has_streaming_input, 'auth_type': operation_model.auth_type, } - endpoint_url, additional_headers = self.client._resolve_endpoint_ruleset( + endpoint_url, additional_headers, *rest = self.client._resolve_endpoint_ruleset( operation_model, operation_kwargs, request_context ) + if rest and rest[0]: + request_context['endpoint_properties'] = rest[0] request_dict = self.client._convert_to_request_dict( api_params=operation_kwargs, operation_model=operation_model, From fb674c3395c6aaeff7f1acaecd8fe1ca54f07fd9 Mon Sep 17 00:00:00 2001 From: Can Yildirim <68567963+canopus1io@users.noreply.github.com> Date: Thu, 21 Mar 2024 14:32:19 -0700 Subject: [PATCH 2/5] add .readthedocs.yaml + update docs requirements.txt --- .readthedocs.yaml | 19 +++++++++++++++++++ docs/requirements.txt | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .readthedocs.yaml diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..f1a827f2a --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,19 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# Optionally declare the Python requirements required to build your docs +python: + install: + - requirements: docs/requirements.txt \ No newline at end of file diff --git a/docs/requirements.txt b/docs/requirements.txt index a17e07caa..7707c79af 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,4 @@ .[signals] -sphinx-rtd-theme==0.4.3 +sphinx>=5 +sphinx-rtd-theme==1.1.1 +sphinx-issues \ No newline at end of file From 2ee8896439e44e989e6e97193357b708b66898ee Mon Sep 17 00:00:00 2001 From: Ilya Priven Date: Mon, 20 May 2024 16:50:48 -0400 Subject: [PATCH 3/5] Update .readthedocs.yaml --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f1a827f2a..54d726287 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -16,4 +16,4 @@ sphinx: # Optionally declare the Python requirements required to build your docs python: install: - - requirements: docs/requirements.txt \ No newline at end of file + - requirements: docs/requirements.txt From 98b027c5276e5ae0b92d2691ce0885bee67f5cd7 Mon Sep 17 00:00:00 2001 From: Ilya Priven Date: Mon, 20 May 2024 16:51:00 -0400 Subject: [PATCH 4/5] Update requirements.txt --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 7707c79af..f35f6193b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ .[signals] sphinx>=5 sphinx-rtd-theme==1.1.1 -sphinx-issues \ No newline at end of file +sphinx-issues From 613b1c7bafbb65aa730ca92ed3c08e49ea6df2f3 Mon Sep 17 00:00:00 2001 From: Ilya Priven Date: Mon, 20 May 2024 16:52:45 -0400 Subject: [PATCH 5/5] bump version and update release notes --- docs/release_notes.rst | 5 +++++ pynamodb/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 75688028f..355e96f6c 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,6 +1,11 @@ Release Notes ============= +v4.4.1 +---------- +* Fix compatibility with botocore 1.33.2 (#1235) + + v4.4.0 ---------- * Update for botocore 1.28 private API change (#1130) which caused the following exception:: diff --git a/pynamodb/__init__.py b/pynamodb/__init__.py index 806321a91..d92538144 100644 --- a/pynamodb/__init__.py +++ b/pynamodb/__init__.py @@ -7,4 +7,4 @@ """ __author__ = 'Jharrod LaFon' __license__ = 'MIT' -__version__ = '4.4.0' +__version__ = '4.4.1'