diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 1db8bdd..286d9b7 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ github: maxbachmann +custom: ["https://www.paypal.com/donate/?hosted_button_id=VGWQBBD5CTWJU"] diff --git a/.github/workflows/releasebuild.yml b/.github/workflows/releasebuild.yml index 4e18bd4..bd95b5f 100644 --- a/.github/workflows/releasebuild.yml +++ b/.github/workflows/releasebuild.yml @@ -36,6 +36,7 @@ jobs: env: CIBW_BUILD: ${{matrix.python_tag}} CIBW_ARCHS: ${{matrix.arch}} + CIBW_TEST_SKIP: "*-win32" CIBW_TEST_REQUIRES: pytest hypothesis pandas CIBW_TEST_COMMAND: pytest {package}/tests CIBW_TEST_COMMAND_LINUX: "{package}/tools/seg_wrapper.sh pytest {package}/tests" @@ -139,7 +140,7 @@ jobs: env: CIBW_ARCHS_LINUX: ${{matrix.arch}} CIBW_BUILD: ${{matrix.python_tag}} - CIBW_TEST_SKIP: "{*_{aarch64,ppc64le,s390x},*musllinux_*}" + CIBW_TEST_SKIP: "{*_{aarch64,ppc64le,s390x,i686},*musllinux_*,pp38-*}" CIBW_TEST_REQUIRES: pytest hypothesis pandas CIBW_TEST_COMMAND: pytest {package}/tests CIBW_TEST_COMMAND_LINUX: "{package}/tools/seg_wrapper.sh pytest {package}/tests" diff --git a/CHANGELOG.md b/CHANGELOG.md index 04e0efa..7e974fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ## Changelog -### [2.4.0] - 2022- +### [2.4.0] - 2022-07-29 +#### Fixed +- fix banded Levenshtein implementation + #### Performance - improve performance and memory usage of `Levenshtein.editops` - memory usage is reduced from O(NM) to O(N) diff --git a/CMakeLists.txt b/CMakeLists.txt index 232c975..5cac6ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ else() add_library(Taskflow::Taskflow ALIAS Taskflow) endif() -find_package(rapidfuzz 1.0.5 QUIET) +find_package(rapidfuzz 1.1.0 QUIET) if (rapidfuzz_FOUND) message("Using system supplied version of rapidfuzz-cpp") else() diff --git a/README.md b/README.md index c574794..4cd0f2c 100644 --- a/README.md +++ b/README.md @@ -172,6 +172,14 @@ The following graph shows how many elements are processed per second with each o Benchmark extractOne +## Support the project + +If you are using RapidFuzz for your work and feel like giving a bit of your own benefit back to support the project, consider sending us money through GitHub Sponsors or PayPal that we can use to buy us free time for the maintenance of this great library, to fix bugs in the software, review and integrate code contributions, to improve its features and documentation, or to just take a deep breath and have a cup of tea every once in a while. Thank you for your support. + +Support the project through [GitHub Sponsors]() or via [PayPal](https://www.paypal.com/donate/?hosted_button_id=VGWQBBD5CTWJU): + +[![](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/donate/?hosted_button_id=VGWQBBD5CTWJU). + ## License RapidFuzz is licensed under the MIT license since I believe that everyone should be able to use it without being forced to adopt the GPL license. Thats why the library is based on an older version of fuzzywuzzy that was MIT licensed as well. This old version of fuzzywuzzy can be found [here](https://github.com/seatgeek/fuzzywuzzy/tree/4bf28161f7005f3aa9d4d931455ac55126918df7). diff --git a/docs/requirements.txt b/docs/requirements.txt index 6b1c4dd..3f73c90 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,4 @@ +docutils==0.18.1 Sphinx furo numpy diff --git a/extern/jarowinkler-cpp b/extern/jarowinkler-cpp index cea663e..655c259 160000 --- a/extern/jarowinkler-cpp +++ b/extern/jarowinkler-cpp @@ -1 +1 @@ -Subproject commit cea663e7db48bee9e6fc6d6d17f4927d46db1840 +Subproject commit 655c25926250f6a73a9380a862a603c70e016aec diff --git a/extern/rapidfuzz-cpp b/extern/rapidfuzz-cpp index da12379..2278c3d 160000 --- a/extern/rapidfuzz-cpp +++ b/extern/rapidfuzz-cpp @@ -1 +1 @@ -Subproject commit da12379bab8bf991e6d7d8eaf6a7fa4c906a60f8 +Subproject commit 2278c3d7371b26bf14bddbcc97c8945fe1c8f971