diff --git a/sktree/_lib/sklearn_fork b/sktree/_lib/sklearn_fork index 6c7a5f44e..1adb20907 160000 --- a/sktree/_lib/sklearn_fork +++ b/sktree/_lib/sklearn_fork @@ -1 +1 @@ -Subproject commit 6c7a5f44eb4ec3bea5dd6a9e4d5db748d12b209e +Subproject commit 1adb209077f12adac8f760196ae5260abab0cbdd diff --git a/sktree/tests/test_honest_forest.py b/sktree/tests/test_honest_forest.py index 91fce420e..9ae94d5b3 100644 --- a/sktree/tests/test_honest_forest.py +++ b/sktree/tests/test_honest_forest.py @@ -188,7 +188,7 @@ def test_sklearn_compatible_estimator(estimator, check): "check_class_weight_classifiers", # TODO: this is an error. Somehow a segfault is raised when fit is called first and # then partial_fit - "check_fit_score_takes_y", + # "check_fit_score_takes_y", ]: pytest.skip() check(estimator) diff --git a/sktree/tests/test_supervised_forest.py b/sktree/tests/test_supervised_forest.py index 291d8a2e9..ee5722ef1 100644 --- a/sktree/tests/test_supervised_forest.py +++ b/sktree/tests/test_supervised_forest.py @@ -193,15 +193,15 @@ def _trunk(n, p=10, random_state=None): ) def test_sklearn_compatible_estimator(estimator, check): # TODO: remove when we can replicate the CI error... - if isinstance( - estimator, - ( - ExtraObliqueRandomForestClassifier, - ObliqueRandomForestClassifier, - PatchObliqueRandomForestClassifier, - ), - ) and check.func.__name__ in ["check_fit_score_takes_y"]: - pytest.skip() + # if isinstance( + # estimator, + # ( + # ExtraObliqueRandomForestClassifier, + # ObliqueRandomForestClassifier, + # PatchObliqueRandomForestClassifier, + # ), + # ) and check.func.__name__ in ["check_fit_score_takes_y"]: + # pytest.skip() check(estimator) diff --git a/sktree/tree/tests/test_tree.py b/sktree/tree/tests/test_tree.py index 478aa6d5b..170b077cd 100644 --- a/sktree/tree/tests/test_tree.py +++ b/sktree/tree/tests/test_tree.py @@ -226,10 +226,10 @@ def test_pickle_splitters(): ) def test_sklearn_compatible_estimator(estimator, check): # TODO: remove when we can replicate the CI error... - if isinstance( - estimator, (PatchObliqueDecisionTreeClassifier, ExtraObliqueDecisionTreeClassifier) - ) and check.func.__name__ in ["check_fit_score_takes_y"]: - pytest.skip() + # if isinstance( + # estimator, (PatchObliqueDecisionTreeClassifier, ExtraObliqueDecisionTreeClassifier) + # ) and check.func.__name__ in ["check_fit_score_takes_y"]: + # pytest.skip() check(estimator)