CVS commit: pkgsrc/textproc/py-rapidfuzz

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/py-rapidfuzz
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 10 Aug 2023 12:00:55 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Aug 10 12:00:55 UTC 2023

Modified Files:
        pkgsrc/textproc/py-rapidfuzz: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/py-rapidfuzz/patches:
            patch-src_rapidfuzz_CMakeLists.txt
            patch-src_rapidfuzz_distance_CMakeLists.txt

Log Message:
py-rapidfuzz: updated to 3.2.0

3.2.0
Changed
- build x86 with sse2/avx2 runtime detection

3.1.2
Changed
- upgrade to ``Cython==3.0.0``


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-rapidfuzz/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-rapidfuzz/PLIST \
    pkgsrc/textproc/py-rapidfuzz/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_CMakeLists.txt \
    pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_distance_CMakeLists.txt

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.13 pkgsrc/textproc/py-rapidfuzz/Makefile:1.14
--- pkgsrc/textproc/py-rapidfuzz/Makefile:1.13  Tue Aug  1 23:20:54 2023
+++ pkgsrc/textproc/py-rapidfuzz/Makefile       Thu Aug 10 12:00:55 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2023/08/01 23:20:54 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2023/08/10 12:00:55 adam Exp $
 
-DISTNAME=      rapidfuzz-3.1.1
+DISTNAME=      rapidfuzz-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/rapidfuzz/}
@@ -10,8 +10,8 @@ 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
+TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build>=0.17.0:../../devel/py-scikit-build
 TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.1:../../devel/py-test
 # optional dependency, but not optional for testing
 TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=0:../../math/py-numpy

Index: pkgsrc/textproc/py-rapidfuzz/PLIST
diff -u pkgsrc/textproc/py-rapidfuzz/PLIST:1.3 pkgsrc/textproc/py-rapidfuzz/PLIST:1.4
--- pkgsrc/textproc/py-rapidfuzz/PLIST:1.3      Sun Jun 25 18:17:33 2023
+++ pkgsrc/textproc/py-rapidfuzz/PLIST  Thu Aug 10 12:00:55 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/06/25 18:17:33 js Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/08/10 12:00:55 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -26,7 +26,7 @@ ${PYSITELIB}/rapidfuzz/_common_py.pyo
 ${PYSITELIB}/rapidfuzz/_feature_detector.py
 ${PYSITELIB}/rapidfuzz/_feature_detector.pyc
 ${PYSITELIB}/rapidfuzz/_feature_detector.pyo
-${PLIST.avx2}${PYSITELIB}/rapidfuzz/_feature_detector_cpp.cpython-${PYTHON_VERSION}.so
+${PLIST.avx2}${PYSITELIB}/rapidfuzz/_feature_detector_cpp.so
 ${PYSITELIB}/rapidfuzz/_utils.py
 ${PYSITELIB}/rapidfuzz/_utils.pyc
 ${PYSITELIB}/rapidfuzz/_utils.pyo
@@ -106,13 +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_cpp.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
-${PLIST.avx2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.cpython-${PYTHON_VERSION}.so
+${PYSITELIB}/rapidfuzz/distance/metrics_cpp.so
+${PLIST.avx2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.so
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.py
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo
@@ -120,8 +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
-${PLIST.avx2}${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.cpython-${PYTHON_VERSION}.so
+${PYSITELIB}/rapidfuzz/fuzz_cpp.so
+${PLIST.avx2}${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.so
 ${PYSITELIB}/rapidfuzz/fuzz_py.py
 ${PYSITELIB}/rapidfuzz/fuzz_py.pyc
 ${PYSITELIB}/rapidfuzz/fuzz_py.pyo
@@ -132,8 +132,8 @@ ${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_cpp_impl.so
 ${PYSITELIB}/rapidfuzz/process_py.py
 ${PYSITELIB}/rapidfuzz/process_py.pyc
 ${PYSITELIB}/rapidfuzz/process_py.pyo
@@ -143,7 +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_cpp.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.3 pkgsrc/textproc/py-rapidfuzz/distinfo:1.4
--- pkgsrc/textproc/py-rapidfuzz/distinfo:1.3   Tue Jun  6 20:53:15 2023
+++ pkgsrc/textproc/py-rapidfuzz/distinfo       Thu Aug 10 12:00:55 2023
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2023/06/06 20:53:15 wiz Exp $
+$NetBSD: distinfo,v 1.4 2023/08/10 12:00:55 adam Exp $
 
-BLAKE2s (rapidfuzz-3.1.1.tar.gz) = 29acc3fa1aa34c0e2c53636650d57b27da2092177e99ec134e5aaa8e011abf21
-SHA512 (rapidfuzz-3.1.1.tar.gz) = d83e07fd3a0b3085e6b93ddf53207110ae329241c23091c561f07fbcabf630a291c4fda3c5bd2baf91d80f5426ac0cdaeda92e87b617214594bfb67b787b85db
-Size (rapidfuzz-3.1.1.tar.gz) = 1279245 bytes
+BLAKE2s (rapidfuzz-3.2.0.tar.gz) = 324269ede4965cf985b6211449d0d8026948961f129eaf9145a857ab76cbbbcd
+SHA512 (rapidfuzz-3.2.0.tar.gz) = 0ea0ecc62e2493519a302edd090521ed7efeae35e73812aeadaca2e2369362b57b1a095a09296edfa8db07b6bf58de4451dc71e96e6c215ebbe96dc1f8e7e995
+Size (rapidfuzz-3.2.0.tar.gz) = 1472554 bytes
+SHA1 (patch-src_rapidfuzz_CMakeLists.txt) = c8295aeb7bcd3e2d0a1cc87ee608187606c88959
+SHA1 (patch-src_rapidfuzz_distance_CMakeLists.txt) = 09a0d18a1bfa53164d163225c6bf6b51b8f81ba0

Added files:

Index: pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_CMakeLists.txt:1.1
--- /dev/null   Thu Aug 10 12:00:55 2023
+++ pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_CMakeLists.txt     Thu Aug 10 12:00:55 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rapidfuzz_CMakeLists.txt,v 1.1 2023/08/10 12:00:55 adam Exp $
+
+Avoid SOABI in module name, so PLIST is constant across platforms.
+
+--- src/rapidfuzz/CMakeLists.txt.orig  2023-08-06 11:40:11.000000000 +0000
++++ src/rapidfuzz/CMakeLists.txt
+@@ -27,7 +27,7 @@ function(rf_add_library name)
+     endif()
+     set_property(TARGET ${name} PROPERTY SUFFIX ".${Python_SOABI}${suffix}")
+   else()
+-    python_add_library(${name} MODULE WITH_SOABI ${ARGV})
++    python_add_library(${name} MODULE ${ARGV})
+   endif()
+ endfunction(rf_add_library)
+ 
Index: pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_distance_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_distance_CMakeLists.txt:1.1
--- /dev/null   Thu Aug 10 12:00:55 2023
+++ pkgsrc/textproc/py-rapidfuzz/patches/patch-src_rapidfuzz_distance_CMakeLists.txt    Thu Aug 10 12:00:55 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rapidfuzz_distance_CMakeLists.txt,v 1.1 2023/08/10 12:00:55 adam Exp $
+
+Avoid SOABI in module name, so PLIST is constant across platforms.
+
+--- src/rapidfuzz/distance/CMakeLists.txt.orig 2023-08-06 11:44:02.000000000 +0000
++++ src/rapidfuzz/distance/CMakeLists.txt
+@@ -28,7 +28,7 @@ function(rf_add_library name)
+     endif()
+     set_property(TARGET ${name} PROPERTY SUFFIX ".${Python_SOABI}${suffix}")
+   else()
+-    python_add_library(${name} MODULE WITH_SOABI ${ARGV})
++    python_add_library(${name} MODULE ${ARGV})
+   endif()
+ endfunction(rf_add_library)
+

Prev by Date: CVS commit: pkgsrc/math/sc-im
Next by Date: CVS commit: pkgsrc/devel/py-curtsies
Previous by Thread: CVS commit: pkgsrc/math/sc-im
Next by Thread: CVS commit: pkgsrc/devel/py-curtsies
Indexes:

Home | Main Index | Thread Index | Old Index