diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f2e4d43..6b61f15b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ ## Changelog -### [unreleased] - +### [2.13.5] - 2022-12-11 #### Added - added docs to sdist +#### Fixed +- fix two cases of undefined behavior in `process.cdist` + ### [2.13.4] - 2022-12-08 #### Changed - handle `float("nan")` similar to None for query / choice, since this is common for diff --git a/CMakeLists.txt b/CMakeLists.txt index e7f5b193..24da57f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ else() add_library(Taskflow::Taskflow ALIAS Taskflow) endif() -find_package(rapidfuzz 1.10.1 QUIET) +find_package(rapidfuzz 1.10.2 QUIET) if(rapidfuzz_FOUND) message(STATUS "Using system supplied version of rapidfuzz-cpp") else() diff --git a/extern/rapidfuzz-cpp b/extern/rapidfuzz-cpp index 749d32ad..1a29b162 160000 --- a/extern/rapidfuzz-cpp +++ b/extern/rapidfuzz-cpp @@ -1 +1 @@ -Subproject commit 749d32ad560d5d9c9917dec61f5d28c2b0923a78 +Subproject commit 1a29b162cd374a86a980dbb3772de9f08c9bc6da diff --git a/setup.py b/setup.py index f25bc036..23b7cb30 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def show_message(*lines): setup_args = { "name": "rapidfuzz", - "version": "2.13.4", + "version": "2.13.5", "extras_require": {"full": ["numpy"]}, "url": "https://github.com/maxbachmann/RapidFuzz", "author": "Max Bachmann", diff --git a/src/rapidfuzz/__init__.py b/src/rapidfuzz/__init__.py index 8cf47a73..290e36ca 100644 --- a/src/rapidfuzz/__init__.py +++ b/src/rapidfuzz/__init__.py @@ -3,7 +3,7 @@ """ __author__: str = "Max Bachmann" __license__: str = "MIT" -__version__: str = "2.13.4" +__version__: str = "2.13.5" from rapidfuzz import distance, fuzz, process, string_metric, utils diff --git a/src/rapidfuzz/process_cpp_impl.pyx b/src/rapidfuzz/process_cpp_impl.pyx index 587ede8f..b89d5ab2 100644 --- a/src/rapidfuzz/process_cpp_impl.pyx +++ b/src/rapidfuzz/process_cpp_impl.pyx @@ -1327,7 +1327,7 @@ cdef inline vector[RF_StringWrapper] preprocess(queries, processor) except *: # No processor if not processor: for query in queries: - proc_queries.emplace_back(conv_sequence(query)) + proc_queries.emplace_back(conv_sequence(query), query) else: processor_capsule = getattr(processor, '_RF_Preprocess', processor) if PyCapsule_IsValid(processor_capsule, NULL): @@ -1337,7 +1337,7 @@ cdef inline vector[RF_StringWrapper] preprocess(queries, processor) except *: if processor_context != NULL and processor_context.version == SCORER_STRUCT_VERSION: for query in queries: processor_context.preprocess(query, &proc_str) - proc_queries.emplace_back(proc_str) + proc_queries.emplace_back(proc_str, query) # Call Processor through Python else: