diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ea8c40f1b..8641074d5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,6 +11,9 @@ on: jobs: deploy: runs-on: ubuntu-latest + environment: release + permissions: + id-token: write steps: - uses: actions/checkout@v3 - name: Set up Python @@ -30,14 +33,11 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 if: ${{ github.event_name == 'release' }} - with: - password: ${{ secrets.PYPI_API_TOKEN }} - name: Publish to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 if: ${{ github.event_name != 'release' }} with: - password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository_url: https://test.pypi.org/legacy/ # Since we run this often, it's OK if that version already exists skip_existing: true diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..54d726287 --- /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 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/docs/requirements.txt b/docs/requirements.txt index a17e07caa..f35f6193b 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 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' 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, diff --git a/requirements-dev.txt b/requirements-dev.txt index 9a4cf313c..cf58f3aac 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ mock pytest>=6 pytest-env pytest-mock -botocore<1.28 +botocore # only used in CI coveralls