diff --git a/devel/py-rapidfuzz/Makefile b/devel/py-rapidfuzz/Makefile index 6473bdc4a542..2d8c223ae025 100644 --- a/devel/py-rapidfuzz/Makefile +++ b/devel/py-rapidfuzz/Makefile @@ -1,39 +1,39 @@ PORTNAME= rapidfuzz -DISTVERSION= 3.10.0 +DISTVERSION= 3.10.1 CATEGORIES= devel MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Rapid fuzzy string matching in Python WWW= https://github.com/rapidfuzz/RapidFuzz LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ ninja:devel/ninja \ rapidfuzz-cpp>0:devel/rapidfuzz-cpp \ taskflow>0:devel/taskflow \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}rapidfuzz-capi==1.0.5:devel/py-rapidfuzz-capi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.10.7:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>=0.13.0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} USES= compiler:c++14-lang python USE_PYTHON= pep517 autoplist pytest # 1 test fails, see https://github.com/rapidfuzz/RapidFuzz/issues/372 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: @cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} && \ ${STRIP_CMD} \ ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so \ ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/distance/*.so ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} .include diff --git a/devel/py-rapidfuzz/distinfo b/devel/py-rapidfuzz/distinfo index a71aa2c747c9..6aec430dcd6b 100644 --- a/devel/py-rapidfuzz/distinfo +++ b/devel/py-rapidfuzz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727162731 -SHA256 (rapidfuzz-3.10.0.tar.gz) = 6b62af27e65bb39276a66533655a2fa3c60a487b03935721c45b7809527979be -SIZE (rapidfuzz-3.10.0.tar.gz) = 57942780 +TIMESTAMP = 1731116509 +SHA256 (rapidfuzz-3.10.1.tar.gz) = 5a15546d847a915b3f42dc79ef9b0c78b998b4e2c53b252e7166284066585979 +SIZE (rapidfuzz-3.10.1.tar.gz) = 57982250 diff --git a/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils.hpp b/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils.hpp deleted file mode 100644 index 6642b9dfc402..000000000000 --- a/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils.hpp +++ /dev/null @@ -1,25 +0,0 @@ ---- src/rapidfuzz/utils.hpp.orig 2024-08-06 20:55:30 UTC -+++ src/rapidfuzz/utils.hpp -@@ -10,7 +10,7 @@ - #include - #include - #include --#include -+#include - - uint32_t UnicodeDefaultProcess(uint32_t ch); - -@@ -80,11 +80,9 @@ template - } - - template --std::basic_string default_process(std::basic_string s) -+std::vector default_process(std::vector str) - { -- std::basic_string str(s); -- -- int64_t len = default_process(&str[0], str.size()); -+ int64_t len = default_process(str.data(), str.size()); - str.resize(len); - return str; - } diff --git a/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils__cpp.hpp b/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils__cpp.hpp deleted file mode 100644 index b7289a739904..000000000000 --- a/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils__cpp.hpp +++ /dev/null @@ -1,29 +0,0 @@ ---- src/rapidfuzz/utils_cpp.hpp.orig 2024-08-06 20:55:30 UTC -+++ src/rapidfuzz/utils_cpp.hpp -@@ -9,20 +9,20 @@ static inline PyObject* default_process_impl(PyObject* - switch (c_sentence.kind) { - case RF_UINT8: - { -- auto proc_str = default_process( -- std::basic_string(static_cast(c_sentence.data), c_sentence.length)); -+ auto data = static_cast(c_sentence.data); -+ auto proc_str = default_process(std::vector(data, data + c_sentence.length)); - return PyUnicode_FromKindAndData(PyUnicode_1BYTE_KIND, proc_str.data(), (Py_ssize_t)proc_str.size()); - } - case RF_UINT16: - { -- auto proc_str = default_process( -- std::basic_string(static_cast(c_sentence.data), c_sentence.length)); -+ auto data = static_cast(c_sentence.data); -+ auto proc_str = default_process(std::vector(data, data + c_sentence.length)); - return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, proc_str.data(), (Py_ssize_t)proc_str.size()); - } - case RF_UINT32: - { -- auto proc_str = default_process( -- std::basic_string(static_cast(c_sentence.data), c_sentence.length)); -+ auto data = static_cast(c_sentence.data); -+ auto proc_str = default_process(std::vector(data, data + c_sentence.length)); - return PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, proc_str.data(), (Py_ssize_t)proc_str.size()); - } - // ToDo: for now do not process these elements should be done in some way in the future