Merge pull request #7200 from janezd/lr-remove-deprecated-multi-class

Logistic regression: Remove deprecated argument multi_class

Author: markotoplak

Orange/classification/logistic_regression.py

@@ -1,13 +1,10 @@
-import warnings
-
 import numpy as np
 import sklearn.linear_model as skl_linear_model
 
 from Orange.classification import SklLearner, SklModel
 from Orange.preprocess import Normalize
 from Orange.preprocess.score import LearnerScorer
 from Orange.data import Variable, DiscreteVariable
-from Orange.util import OrangeDeprecationWarning
 
 
 __all__ = ["LogisticRegressionLearner"]
@@ -42,23 +39,13 @@ class LogisticRegressionLearner(SklLearner, _FeatureScorerMixin):
     def __init__(self, penalty="l2", dual=False, tol=0.0001, C=1.0,
                  fit_intercept=True, intercept_scaling=1, class_weight=None,
                  random_state=None, solver="auto", max_iter=100,
-                 multi_class="deprecated", verbose=0, n_jobs=1, preprocessors=None):
-        if multi_class != "deprecated":
-            warnings.warn("The multi_class parameter was "
-                          "deprecated in scikit-learn 1.5. Using it with "
-                          "scikit-learn 1.7 will lead to a crash.",
-                          OrangeDeprecationWarning,
-                          stacklevel=2)
+                 verbose=0, n_jobs=1, preprocessors=None):
         super().__init__(preprocessors=preprocessors)
         self.params = vars()
 
     def _initialize_wrapped(self):
         params = self.params.copy()
 
-        multi_class = params.pop("multi_class")
-        if multi_class != "deprecated":
-            params["multi_class"] = multi_class
-
         # The default scikit-learn solver `lbfgs` (v0.22) does not support the
         # l1 penalty.
         solver, penalty = params.pop("solver"), params.get("penalty")

Orange/tests/test_logistic_regression.py

@@ -156,11 +156,3 @@ def test_auto_solver(self):
 
     def test_supports_weights(self):
         self.assertTrue(LogisticRegressionLearner().supports_weights)
-
-    def test_multi_class_deprecation(self):
-        with self.assertWarns(OrangeDeprecationWarning):
-            LogisticRegressionLearner(penalty="l1", multi_class="multinomial")
-        now = datetime.now()
-        if (now.year, now.month) >= (2026, 1):
-            raise Exception("If Orange depends on scikit-learn >= 1.7, remove this test "
-                            "and any mention of multi_class in LogisticRegressionLearner.")