From 9ffe7fbb667204b8e9b5a008aea2cf884f70f0a8 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 3 Dec 2024 15:17:54 +1100 Subject: [PATCH 1/4] Update version to 1.17.1 for GitHub actions build fix. --- src/wrapt/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wrapt/__init__.py b/src/wrapt/__init__.py index e634fd3..ffc8049 100644 --- a/src/wrapt/__init__.py +++ b/src/wrapt/__init__.py @@ -1,4 +1,4 @@ -__version_info__ = ('1', '17', '0') +__version_info__ = ('1', '17', '1') __version__ = '.'.join(__version_info__) from .__wrapt__ import (ObjectProxy, CallableObjectProxy, FunctionWrapper, From 87fe7269353ec89446bb61a9c005a5bca21c7f58 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 3 Dec 2024 15:18:20 +1100 Subject: [PATCH 2/4] Not building amd64 wheels on macos due to GitHub changes. --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b9e673..b2429b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -213,20 +213,18 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-latest, macos-latest] + os: [ubuntu-20.04, windows-latest, macos-13, macos-14] arch: [auto] include: - os: ubuntu-20.04 arch: aarch64 - - os: macos-latest - arch: arm64 steps: - uses: actions/checkout@v3 - name: Set up QEMU if: ${{ matrix.arch == 'aarch64' }} uses: docker/setup-qemu-action@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel@v2.22.0 with: output-dir: dist env: From 563525d551e9a7ac4dc0b76736a3d27fe5db27f8 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 3 Dec 2024 15:37:41 +1100 Subject: [PATCH 3/4] Add 1.17.1 release notes. --- docs/changes.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/changes.rst b/docs/changes.rst index 60e8bd0..f13fb94 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,6 +1,13 @@ Release Notes ============= +Version 1.17.1 +-------------- + +**Bugs Fixed** + +* Due to GitHub actions changes, binary wheels were missing for macOS Intel. + Version 1.17.0 -------------- From 0da4ba568953b58cb0fe022684cf58fc307c9d83 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 5 Dec 2024 16:23:51 +1100 Subject: [PATCH 4/4] Exception string referencing wrong function name. --- docs/changes.rst | 3 +++ src/wrapt/_wrappers.c | 2 +- src/wrapt/wrappers.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index f13fb94..ee091d0 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -8,6 +8,9 @@ Version 1.17.1 * Due to GitHub actions changes, binary wheels were missing for macOS Intel. +* Not implemented error for `__reduce__()` on `ObjectProxy` was incorrectly + displaying the error as being on `__reduce_ex__()`. + Version 1.17.0 -------------- diff --git a/src/wrapt/_wrappers.c b/src/wrapt/_wrappers.c index 433af1b..7f85855 100644 --- a/src/wrapt/_wrappers.c +++ b/src/wrapt/_wrappers.c @@ -1253,7 +1253,7 @@ static PyObject *WraptObjectProxy_reduce( WraptObjectProxyObject *self, PyObject *args, PyObject *kwds) { PyErr_SetString(PyExc_NotImplementedError, - "object proxy must define __reduce_ex__()"); + "object proxy must define __reduce__()"); return NULL; } diff --git a/src/wrapt/wrappers.py b/src/wrapt/wrappers.py index f70ee79..62da8a3 100644 --- a/src/wrapt/wrappers.py +++ b/src/wrapt/wrappers.py @@ -440,7 +440,7 @@ def __deepcopy__(self, memo): def __reduce__(self): raise NotImplementedError( - 'object proxy must define __reduce_ex__()') + 'object proxy must define __reduce__()') def __reduce_ex__(self, protocol): raise NotImplementedError(