Merge branch 'release/1.17.1'

GrahamDumpleton · Jan 11, 2025 · c41e6ea · c41e6ea
2 parents e663d49 + 0da4ba5
commit c41e6ea
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git 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:

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,16 @@
 Release Notes
 =============
 
+Version 1.17.1
+--------------
+
+**Bugs Fixed**
+
+* 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/__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,

diff --git 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
@@ -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(