release 3.1.1

CHANGELOG.rst

@@ -1,6 +1,17 @@
 Changelog
 ---------
 
+[3.1.1] - 2023-06-06
+^^^^^^^^^^^^^^^^^^^^
+Changed
+~~~~~~~
+- upgrade to ``taskflow==3.6``
+
+Fixed
+~~~~~
+- replace usage of ``isnan`` with ``std::isnan`` which fixes the build on NetBSD
+
+
 [3.1.0] - 2023-06-02
 ^^^^^^^^^^^^^^^^^^^^
 Changed

CMakeLists.txt

@@ -72,7 +72,7 @@ check_cpu_arch_x64(RAPIDFUZZ_ARCH_X64)
 
 set(RF_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
-find_package(Taskflow 3.0.0 QUIET)
+find_package(Taskflow 3.3.0 QUIET)
 if(Taskflow_FOUND)
   message(STATUS "Using system supplied version of Taskflow")
 else()

setup.py

@@ -15,7 +15,7 @@ def show_message(*lines):
 
 setup_args = {
     "name": "rapidfuzz",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "extras_require": {"full": ["numpy"]},
     "url": "https://github.com/maxbachmann/RapidFuzz",
     "author": "Max Bachmann",

src/rapidfuzz/__init__.py

@@ -5,7 +5,7 @@
 
 __author__: str = "Max Bachmann"
 __license__: str = "MIT"
-__version__: str = "3.1.0"
+__version__: str = "3.1.1"
 
 from rapidfuzz import distance, fuzz, process, utils
 

src/rapidfuzz/distance/metrics_cpp.pyx

@@ -33,7 +33,7 @@ from cpp_common cimport (
     SetScorerAttrs,
     preprocess_strings,
 )
-from libc.math cimport isnan
+from libcpp.cmath cimport isnan
 from libc.stdint cimport INT64_MAX, int64_t
 from libc.stdlib cimport free, malloc
 from libcpp cimport bool
@@ -177,7 +177,7 @@ cdef inline bool is_none(s):
     if s is None:
         return True
 
-    if isinstance(s, float) and isnan(s):
+    if isinstance(s, float) and isnan(<double>s):
         return True
 
     return False

src/rapidfuzz/fuzz_cpp.pyx

@@ -28,7 +28,7 @@ from cpp_common cimport (
     SetScorerAttrs,
     preprocess_strings,
 )
-from libc.math cimport isnan
+from libcpp.cmath cimport isnan
 from libc.stdint cimport int64_t, uint32_t
 from libcpp cimport bool
 
@@ -66,7 +66,7 @@ cdef inline bool is_none(s):
     if s is None:
         return True
 
-    if isinstance(s, float) and isnan(s):
+    if isinstance(s, float) and isnan(<double>s):
         return True
 
     return False

src/rapidfuzz/process_cpp.hpp

@@ -2,6 +2,7 @@
 #include "cpp_common.hpp"
 #include "rapidfuzz.h"
 #include "taskflow/taskflow.hpp"
+#include "taskflow/algorithm/for_each.hpp"
 #include <atomic>
 #include <chrono>
 #include <exception>

src/rapidfuzz/process_cpp_impl.pyx

@@ -18,7 +18,7 @@ from cpython.exc cimport PyErr_CheckSignals
 from cpython.list cimport PyList_New, PyList_SET_ITEM
 from cpython.object cimport PyObject
 from cpython.ref cimport Py_INCREF
-from libc.math cimport floor, isnan
+from libcpp.cmath cimport floor, isnan
 from libc.stdint cimport int32_t, int64_t, uint8_t, uint64_t
 from libcpp cimport algorithm, bool
 from libcpp.utility cimport move
@@ -132,7 +132,7 @@ cdef inline bool is_none(s):
     if s is None:
         return True
 
-    if isinstance(s, float) and isnan(s):
+    if isinstance(s, float) and isnan(<double>s):
         return True
 
     return False