workaround some external bugs
This commit is contained in:
parent
7481ffe886
commit
24bf7987bb
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
]
|
||||
|
|
|
@ -402,7 +402,8 @@ template <template <typename> class CachedScorer, typename T, typename Sentence1
|
|||
static inline RF_ScorerFunc get_ScorerContext(Sentence1 s1, Args... args)
|
||||
{
|
||||
RF_ScorerFunc context;
|
||||
context.context = (void*)new CachedScorer(s1, args...);
|
||||
/* deduction guides are broken here in some gcc versions */
|
||||
context.context = (void*)new CachedScorer<typename decltype(s1)::value_type>(s1, args...);
|
||||
context.dtor = scorer_deinit<CachedScorer<typename Sentence1::value_type>>;
|
||||
return context;
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 1f4d4d6..1f94979 100644
|
||||
index 4fcb1d7..af19a4a 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -2,7 +2,6 @@
|
||||
requires = [
|
||||
@@ -3,7 +3,6 @@ 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"
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue