diff --git a/CHANGELOG.md b/CHANGELOG.md index 535a1c1..1ad10cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## Changelog +### [2.10.3] - 2022-08-30 +#### Fixed +- always use `scikit-build=0.14.1` since both `0.14.0` and `0.15.0` are broken +- workaround gcc in bug in template type deduction + ### [2.10.2] - 2022-08-27 #### Fixed - fix support for cmake versions below 3.17 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5948759..2faa7b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(rapidfuzz LANGUAGES C CXX) if (MSVC) add_compile_options(/W4 /bigobj) else() - add_compile_options(-Wall -Wextra -pedantic) + add_compile_options(-Wall -Wextra -pedantic -Wno-psabi) endif() if(CMAKE_VERSION VERSION_LESS 3.18) diff --git a/pyproject.toml b/pyproject.toml index e69de8c..4fcb1d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,8 @@ [build-system] requires = [ "setuptools>=42", - "scikit-build==0.15.0", + "scikit-build==0.14.1; platform_system=='Linux'", + "scikit-build==0.15.0; platform_system!='Linux'", "Cython==3.0.0a11", "rapidfuzz_capi==1.0.5" ] diff --git a/src/rapidfuzz/cpp_common.hpp b/src/rapidfuzz/cpp_common.hpp index 9082ac9..8014b99 100644 --- a/src/rapidfuzz/cpp_common.hpp +++ b/src/rapidfuzz/cpp_common.hpp @@ -402,7 +402,8 @@ template