Update to latest toolz: make juxt a class with .funcs

.github/workflows/wheels.yml

@@ -1,6 +1,7 @@
 name: Build wheels
 
 on:
+  # pull_request:  # Uncomment to debug wheel building in a PR
   push:
     branches:
       - master
@@ -23,10 +24,13 @@ jobs:
           # # Archs: https://cibuildwheel.readthedocs.io/en/stable/options/#archs
           # # This probably isn't the preferred way to do things :shrug:
           #
+          # # PyPy may have issues.  Intermittent failures have been seen on:
+          # # pp37-manylinux_aarch64 pp38-win_amd64
+          #
           # pys = ['cp36', 'cp37', 'cp38', 'cp39', 'cp310']
           # pys_arm = ['cp38', 'cp39', 'cp310']
           # pypys = ['pp37', 'pp38', 'pp39']
-          # SKIP = {"pp37-manylinux_aarch64"}
+          # SKIP = set()  # {"pp37-manylinux_aarch64", "pp38-win_amd64"}
           # combos = []
           #
           # # Linux
@@ -120,8 +124,8 @@ jobs:
           - {"os": "ubuntu", "build": "cp310-musllinux_ppc64le", "arch": "ppc64le"}
           - {"os": "ubuntu", "build": "cp310-musllinux_s390x", "arch": "s390x"}
           - {"os": "ubuntu", "build": "cp310-musllinux_x86_64", "arch": "x86_64"}
-          # Segfault in test_dicttoolz.py:test_merge_with
-          # - {"os": "ubuntu", "build": "pp37-manylinux_aarch64", "arch": "aarch64"}
+          # Intermittent segfault on pp37-manylinux_aarch64 in test_dicttoolz.py:test_merge_with
+          - {"os": "ubuntu", "build": "pp37-manylinux_aarch64", "arch": "aarch64"}
           - {"os": "ubuntu", "build": "pp37-manylinux_i686", "arch": "i686"}
           - {"os": "ubuntu", "build": "pp37-manylinux_x86_64", "arch": "x86_64"}
           - {"os": "ubuntu", "build": "pp38-manylinux_aarch64", "arch": "aarch64"}

cytoolz/__init__.pxd

@@ -7,7 +7,7 @@ from cytoolz.itertoolz cimport (
 
 
 from cytoolz.functoolz cimport (
-    c_compose, c_juxt, memoize, c_pipe, c_thread_first, c_thread_last,
+    c_compose, memoize, c_pipe, c_thread_first, c_thread_last,
     complement, curry, do, identity, excepts, flip)
 
 

cytoolz/__init__.py

@@ -23,5 +23,10 @@
 
 functoolz._sigs.update_signature_registry()
 
-from ._version import __version__, __toolz_version__
+# What version of toolz does cytoolz implement?
+__toolz_version__ = '0.12.0'
 
+from ._version import get_versions
+
+__version__ = get_versions()['version']
+del get_versions

cytoolz/_version.py

@@ -18,10 +18,6 @@
 import functools
 
 
-# What version of toolz does cytoolz implement?  Placed here compatibility.
-__toolz_version__ = '0.12.0'
-
-
 def get_keywords():
     """Get the keywords needed to look up the version information."""
     # these strings will be replaced by git during git-archive.
@@ -659,6 +655,3 @@ def get_versions():
     return {"version": "0+unknown", "full-revisionid": None,
             "dirty": None,
             "error": "unable to compute version", "date": None}
-
-
-__version__ = get_versions()['version']

cytoolz/functoolz.pxd

@@ -48,13 +48,10 @@ cdef class complement:
     cdef object func
 
 
-cdef class _juxt_inner:
+cdef class juxt:
     cdef public tuple funcs
 
 
-cdef object c_juxt(object funcs)
-
-
 cpdef object do(object func, object x)
 
 

cytoolz/functoolz.pyx

@@ -691,26 +691,9 @@ cdef class complement:
         return (complement, (self.func,))
 
 
-cdef class _juxt_inner:
-    def __cinit__(self, funcs):
-        self.funcs = tuple(funcs)
-
-    def __call__(self, *args, **kwargs):
-        if kwargs:
-            return tuple(PyObject_Call(func, args, kwargs) for func in self.funcs)
-        else:
-            return tuple(PyObject_CallObject(func, args) for func in self.funcs)
+cdef class juxt:
+    """ juxt(self, *funcs)
 
-    def __reduce__(self):
-        return (_juxt_inner, (self.funcs,))
-
-
-cdef object c_juxt(object funcs):
-    return _juxt_inner(funcs)
-
-
-def juxt(*funcs):
-    """
     Creates a function that calls several functions with the same arguments
 
     Takes several functions and returns a function that applies its arguments
@@ -726,9 +709,19 @@ def juxt(*funcs):
     >>> juxt([inc, double])(10)
     (11, 20)
     """
-    if len(funcs) == 1 and not PyCallable_Check(funcs[0]):
-        funcs = funcs[0]
-    return c_juxt(funcs)
+    def __cinit__(self, *funcs):
+        if len(funcs) == 1 and not PyCallable_Check(funcs[0]):
+            funcs = funcs[0]
+        self.funcs = tuple(funcs)
+
+    def __call__(self, *args, **kwargs):
+        if kwargs:
+            return tuple(PyObject_Call(func, args, kwargs) for func in self.funcs)
+        else:
+            return tuple(PyObject_CallObject(func, args) for func in self.funcs)
+
+    def __reduce__(self):
+        return (juxt, (self.funcs,))
 
 
 cpdef object do(object func, object x):
@@ -796,7 +789,8 @@ cpdef object return_none(object exc):
 
 
 cdef class excepts:
-    """
+    """ excepts(self, exc, func, handler=return_none)
+
     A wrapper around a function to catch exceptions and
     dispatch to a handler.
 
@@ -825,7 +819,7 @@ cdef class excepts:
     1
     """
 
-    def __init__(self, exc, func, handler=return_none):
+    def __cinit__(self, exc, func, handler=return_none):
         self.exc = exc
         self.func = func
         self.handler = handler