From 22a8a4df0095401432c6d8da89d1eb06ddf382d7 Mon Sep 17 00:00:00 2001 From: David Cortes Date: Fri, 21 Nov 2025 10:51:30 +0100 Subject: [PATCH 1/4] remove test that's no longer relevant --- tests/test_model_builders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_model_builders.py b/tests/test_model_builders.py index 70a2e687d8..b82b053d0f 100644 --- a/tests/test_model_builders.py +++ b/tests/test_model_builders.py @@ -2184,7 +2184,7 @@ def test_logreg_builder_sequential_calls(): ), ] if not sklearn_check_version("1.8") - else [(LogisticRegression(solver="liblinear"), 2)] + else [] ) + [ # case below might change in the future if sklearn improves their modules From 9be873a036f8e52c42f365c3ebc7496574aa314b Mon Sep 17 00:00:00 2001 From: David Cortes Date: Mon, 24 Nov 2025 08:29:33 +0100 Subject: [PATCH 2/4] clearer skip logic --- tests/test_model_builders.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/test_model_builders.py b/tests/test_model_builders.py index b82b053d0f..ba6aaa7681 100644 --- a/tests/test_model_builders.py +++ b/tests/test_model_builders.py @@ -2172,21 +2172,23 @@ def test_logreg_builder_sequential_calls(): # on decides to disallow some of these combinations. @pytest.mark.parametrize( "estimator_skl,n_classes", - ( - [ - ( - LogisticRegression(multi_class="ovr"), - 3, + [ + pytest.param( + LogisticRegression(multi_class="ovr"), + 3, + marks=pytest.mark.skipif( + not sklearn_check_version("1.8"), + reason="Methodological flaw from sklearn fixed in 1.8", ), - ( - LogisticRegression(multi_class="multinomial"), - 2, + ), + pytest.param( + LogisticRegression(multi_class="multinomial"), + 2, + marks=pytest.mark.skipif( + not sklearn_check_version("1.8"), + reason="Methodological flaw from sklearn fixed in 1.8", ), - ] - if not sklearn_check_version("1.8") - else [] - ) - + [ + ), # case below might change in the future if sklearn improves their modules pytest.param( SGDClassifier(loss="log_loss"), From 0d27731c9935e2f8a41e23505a0c5054be8775db Mon Sep 17 00:00:00 2001 From: David Cortes Date: Wed, 26 Nov 2025 10:42:37 +0100 Subject: [PATCH 3/4] fix directionality of skips --- tests/test_model_builders.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_model_builders.py b/tests/test_model_builders.py index ba6aaa7681..150608c01b 100644 --- a/tests/test_model_builders.py +++ b/tests/test_model_builders.py @@ -2177,7 +2177,7 @@ def test_logreg_builder_sequential_calls(): LogisticRegression(multi_class="ovr"), 3, marks=pytest.mark.skipif( - not sklearn_check_version("1.8"), + sklearn_check_version("1.8"), reason="Methodological flaw from sklearn fixed in 1.8", ), ), @@ -2185,7 +2185,7 @@ def test_logreg_builder_sequential_calls(): LogisticRegression(multi_class="multinomial"), 2, marks=pytest.mark.skipif( - not sklearn_check_version("1.8"), + sklearn_check_version("1.8"), reason="Methodological flaw from sklearn fixed in 1.8", ), ), From 90fced2f6b950b2f6a0351915c9f4e6bc26b9769 Mon Sep 17 00:00:00 2001 From: David Cortes Date: Wed, 26 Nov 2025 10:44:55 +0100 Subject: [PATCH 4/4] revert logic --- tests/test_model_builders.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/test_model_builders.py b/tests/test_model_builders.py index 150608c01b..b82b053d0f 100644 --- a/tests/test_model_builders.py +++ b/tests/test_model_builders.py @@ -2172,23 +2172,21 @@ def test_logreg_builder_sequential_calls(): # on decides to disallow some of these combinations. @pytest.mark.parametrize( "estimator_skl,n_classes", - [ - pytest.param( - LogisticRegression(multi_class="ovr"), - 3, - marks=pytest.mark.skipif( - sklearn_check_version("1.8"), - reason="Methodological flaw from sklearn fixed in 1.8", + ( + [ + ( + LogisticRegression(multi_class="ovr"), + 3, ), - ), - pytest.param( - LogisticRegression(multi_class="multinomial"), - 2, - marks=pytest.mark.skipif( - sklearn_check_version("1.8"), - reason="Methodological flaw from sklearn fixed in 1.8", + ( + LogisticRegression(multi_class="multinomial"), + 2, ), - ), + ] + if not sklearn_check_version("1.8") + else [] + ) + + [ # case below might change in the future if sklearn improves their modules pytest.param( SGDClassifier(loss="log_loss"),