CVS commit: pkgsrc/textproc/py-rapidfuzz

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  6 09:39:09 UTC 2023

Modified Files:
        pkgsrc/textproc/py-rapidfuzz: Makefile PLIST distinfo

Log Message:
py-rapidfuzz: update to 3.1.0.

pkgsrc change: Build C extension.

[3.1.0] - 2023-06-02
^^^^^^^^^^^^^^^^^^^^
Changed
~~~~~~~
- added keyword argument ``pad`` to Hamming distance. This controls whether sequences of different
  length should be padded or lead to a ``ValueError``
- improve consistency of exception messages between the C++ and pure Python implementation
- upgrade required Cython version to ``Cython==3.0.0b3``

Fixed
~~~~~
- fix missing GIL restore when an exception is thrown inside ``process.cdist``
- fix incorrect type hints for the ``process`` module


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-rapidfuzz/Makefile \
    pkgsrc/textproc/py-rapidfuzz/PLIST pkgsrc/textproc/py-rapidfuzz/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/py-rapidfuzz/Makefile
diff -u pkgsrc/textproc/py-rapidfuzz/Makefile:1.1 pkgsrc/textproc/py-rapidfuzz/Makefile:1.2
--- pkgsrc/textproc/py-rapidfuzz/Makefile:1.1   Mon Apr 17 20:35:02 2023
+++ pkgsrc/textproc/py-rapidfuzz/Makefile       Tue Jun  6 09:39:09 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2023/04/17 20:35:02 adam Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/06 09:39:09 wiz Exp $
 
-DISTNAME=      rapidfuzz-3.0.0
+DISTNAME=      rapidfuzz-3.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/rapidfuzz/}
@@ -10,10 +10,34 @@ HOMEPAGE=   https://github.com/maxbachmann
 COMMENT=       Rapid fuzzy string matching
 LICENSE=       mit
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build>=0.17.0:../../devel/py-scikit-build
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
 TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.1:../../devel/py-test
+# optional dependency, but not optional for testing
+TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=0:../../math/py-numpy
+TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=0:../../devel/py-hypothesis
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+PLIST_SUBST+=  PYTHON_VERSION=${PYTHON_VERSION}
+
+USE_LANGUAGES= c c++
+
+# https://github.com/maxbachmann/RapidFuzz/issues/330
+SUBST_CLASSES+=                isnan
+SUBST_SED.isnan=       -e 's/isnan/std::isnan/'
+SUBST_FILES.isnan+=    src/rapidfuzz/distance/metrics_cpp.cxx
+SUBST_FILES.isnan+=    src/rapidfuzz/distance/metrics_cpp.pyx
+SUBST_FILES.isnan+=    src/rapidfuzz/distance/metrics_cpp_avx2.cxx
+SUBST_FILES.isnan+=    src/rapidfuzz/fuzz_cpp.cxx
+SUBST_FILES.isnan+=    src/rapidfuzz/fuzz_cpp.pyx
+SUBST_FILES.isnan+=    src/rapidfuzz/fuzz_cpp_avx2.cxx
+SUBST_FILES.isnan+=    src/rapidfuzz/process_cpp_impl.cxx
+SUBST_FILES.isnan+=    src/rapidfuzz/process_cpp_impl.pyx
+SUBST_MESSAGE.isnan=   Fixing isnan issue.
+SUBST_STAGE.isnan=     post-extract
+
+# needs 'make install'
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
Index: pkgsrc/textproc/py-rapidfuzz/PLIST
diff -u pkgsrc/textproc/py-rapidfuzz/PLIST:1.1 pkgsrc/textproc/py-rapidfuzz/PLIST:1.2
--- pkgsrc/textproc/py-rapidfuzz/PLIST:1.1      Mon Apr 17 20:35:02 2023
+++ pkgsrc/textproc/py-rapidfuzz/PLIST  Tue Jun  6 09:39:09 2023
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2023/04/17 20:35:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/06/06 09:39:09 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/rapidfuzz/__init__.pxd
@@ -25,6 +26,7 @@ ${PYSITELIB}/rapidfuzz/_common_py.pyo
 ${PYSITELIB}/rapidfuzz/_feature_detector.py
 ${PYSITELIB}/rapidfuzz/_feature_detector.pyc
 ${PYSITELIB}/rapidfuzz/_feature_detector.pyo
+${PYSITELIB}/rapidfuzz/_feature_detector_cpp.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/_utils.py
 ${PYSITELIB}/rapidfuzz/_utils.pyc
 ${PYSITELIB}/rapidfuzz/_utils.pyo
@@ -104,10 +106,13 @@ ${PYSITELIB}/rapidfuzz/distance/_initial
 ${PYSITELIB}/rapidfuzz/distance/_initialize.pyc
 ${PYSITELIB}/rapidfuzz/distance/_initialize.pyi
 ${PYSITELIB}/rapidfuzz/distance/_initialize.pyo
+${PYSITELIB}/rapidfuzz/distance/_initialize_cpp.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/distance/_initialize_py.py
 ${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyc
 ${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyo
+${PYSITELIB}/rapidfuzz/distance/metrics_cpp.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/distance/metrics_cpp.pyi
+${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.py
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo
@@ -115,6 +120,8 @@ ${PYSITELIB}/rapidfuzz/fuzz.py
 ${PYSITELIB}/rapidfuzz/fuzz.pyc
 ${PYSITELIB}/rapidfuzz/fuzz.pyi
 ${PYSITELIB}/rapidfuzz/fuzz.pyo
+${PYSITELIB}/rapidfuzz/fuzz_cpp.cpython-${PYTHON_VERSION}.so
+${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/fuzz_py.py
 ${PYSITELIB}/rapidfuzz/fuzz_py.pyc
 ${PYSITELIB}/rapidfuzz/fuzz_py.pyo
@@ -125,6 +132,7 @@ ${PYSITELIB}/rapidfuzz/process.pyo
 ${PYSITELIB}/rapidfuzz/process_cpp.py
 ${PYSITELIB}/rapidfuzz/process_cpp.pyc
 ${PYSITELIB}/rapidfuzz/process_cpp.pyo
+${PYSITELIB}/rapidfuzz/process_cpp_impl.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/process_cpp_impl.pyi
 ${PYSITELIB}/rapidfuzz/process_py.py
 ${PYSITELIB}/rapidfuzz/process_py.pyc
@@ -135,6 +143,7 @@ ${PYSITELIB}/rapidfuzz/utils.py
 ${PYSITELIB}/rapidfuzz/utils.pyc
 ${PYSITELIB}/rapidfuzz/utils.pyi
 ${PYSITELIB}/rapidfuzz/utils.pyo
+${PYSITELIB}/rapidfuzz/utils_cpp.cpython-${PYTHON_VERSION}.so
 ${PYSITELIB}/rapidfuzz/utils_py.py
 ${PYSITELIB}/rapidfuzz/utils_py.pyc
 ${PYSITELIB}/rapidfuzz/utils_py.pyo
Index: pkgsrc/textproc/py-rapidfuzz/distinfo
diff -u pkgsrc/textproc/py-rapidfuzz/distinfo:1.1 pkgsrc/textproc/py-rapidfuzz/distinfo:1.2
--- pkgsrc/textproc/py-rapidfuzz/distinfo:1.1   Mon Apr 17 20:35:02 2023
+++ pkgsrc/textproc/py-rapidfuzz/distinfo       Tue Jun  6 09:39:09 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2023/04/17 20:35:02 adam Exp $
+$NetBSD: distinfo,v 1.2 2023/06/06 09:39:09 wiz Exp $
 
-BLAKE2s (rapidfuzz-3.0.0.tar.gz) = 9f65ef622631b218b00036cc9fb65c19bbf68413bb724cc2fa22c3490f699e34
-SHA512 (rapidfuzz-3.0.0.tar.gz) = bafdb6045baa78154026dc0eb2498eb0031f03c36e8b17a9219d6e0c55041a9b6c164f4fcc0523480903fece0ab4e2e50a8f969a52b6934fcfbad80d8eadba25
-Size (rapidfuzz-3.0.0.tar.gz) = 1230857 bytes
+BLAKE2s (rapidfuzz-3.1.0.tar.gz) = d9c65387cc825f2b64d78208e59cc89013abda005b8252507070cf7451019e90
+SHA512 (rapidfuzz-3.1.0.tar.gz) = ff583a7b87d64b3b00d785533af3ba76d1ffa5dbc65111f4b72c2e7d84a43fe149e2f5546c6af130617e58e35556a7b2143ff6ed24dcf199d24b81ff7b46abc0
+Size (rapidfuzz-3.1.0.tar.gz) = 1251075 bytes