MNT Clean-up deprecations for 1.7: old tags (scikit-learn#31134)

Author: jeremiedbb

sklearn/base.py

@@ -30,14 +30,11 @@
 )
 from .utils.fixes import _IS_32BIT
 from .utils.validation import (
-    _check_feature_names,
     _check_feature_names_in,
-    _check_n_features,
     _generate_get_feature_names_out,
     _is_fitted,
     check_array,
     check_is_fitted,
-    validate_data,
 )
 
 
@@ -389,33 +386,6 @@ def __setstate__(self, state):
         except AttributeError:
             self.__dict__.update(state)
 
-    # TODO(1.7): Remove this method
-    def _more_tags(self):
-        """This code should never be reached since our `get_tags` will fallback on
-        `__sklearn_tags__` implemented below. We keep it for backward compatibility.
-        It is tested in `test_base_estimator_more_tags` in
-        `sklearn/utils/testing/test_tags.py`."""
-        from sklearn.utils._tags import _to_old_tags, default_tags
-
-        warnings.warn(
-            "The `_more_tags` method is deprecated in 1.6 and will be removed in "
-            "1.7. Please implement the `__sklearn_tags__` method.",
-            category=DeprecationWarning,
-        )
-        return _to_old_tags(default_tags(self))
-
-    # TODO(1.7): Remove this method
-    def _get_tags(self):
-        from sklearn.utils._tags import _to_old_tags, get_tags
-
-        warnings.warn(
-            "The `_get_tags` method is deprecated in 1.6 and will be removed in "
-            "1.7. Please implement the `__sklearn_tags__` method.",
-            category=DeprecationWarning,
-        )
-
-        return _to_old_tags(get_tags(self))
-
     def __sklearn_tags__(self):
         return Tags(
             estimator_type=None,
@@ -469,35 +439,6 @@ def _repr_mimebundle_(self, **kwargs):
             output["text/html"] = estimator_html_repr(self)
         return output
 
-    # TODO(1.7): Remove this method
-    def _validate_data(self, *args, **kwargs):
-        warnings.warn(
-            "`BaseEstimator._validate_data` is deprecated in 1.6 and will be removed "
-            "in 1.7. Use `sklearn.utils.validation.validate_data` instead. This "
-            "function becomes public and is part of the scikit-learn developer API.",
-            FutureWarning,
-        )
-        return validate_data(self, *args, **kwargs)
-
-    # TODO(1.7): Remove this method
-    def _check_n_features(self, *args, **kwargs):
-        warnings.warn(
-            "`BaseEstimator._check_n_features` is deprecated in 1.6 and will be "
-            "removed in 1.7. Use `sklearn.utils.validation._check_n_features` instead.",
-            FutureWarning,
-        )
-        _check_n_features(self, *args, **kwargs)
-
-    # TODO(1.7): Remove this method
-    def _check_feature_names(self, *args, **kwargs):
-        warnings.warn(
-            "`BaseEstimator._check_feature_names` is deprecated in 1.6 and will be "
-            "removed in 1.7. Use `sklearn.utils.validation._check_feature_names` "
-            "instead.",
-            FutureWarning,
-        )
-        _check_feature_names(self, *args, **kwargs)
-
 
 class ClassifierMixin:
     """Mixin class for all classifiers in scikit-learn.

sklearn/pipeline.py

@@ -1221,7 +1221,7 @@ def __sklearn_tags__(self):
             tags.input_tags.sparse = all(
                 get_tags(step).input_tags.sparse
                 for name, step in self.steps
-                if step != "passthrough"
+                if step is not None and step != "passthrough"
             )
         except (ValueError, AttributeError, TypeError):
             # This happens when the `steps` is not a list of (name, estimator)

sklearn/tests/test_common.py

@@ -19,7 +19,6 @@
 import sklearn
 from sklearn.base import BaseEstimator
 from sklearn.compose import ColumnTransformer
-from sklearn.datasets import make_classification
 from sklearn.exceptions import ConvergenceWarning
 
 # make it possible to discover experimental estimators when calling `all_estimators`
@@ -401,37 +400,3 @@ def test_check_inplace_ensure_writeable(estimator):
         estimator.set_params(kernel="precomputed")
 
     check_inplace_ensure_writeable(name, estimator)
-
-
-# TODO(1.7): Remove this test when the deprecation cycle is over
-def test_transition_public_api_deprecations():
-    """This test checks that we raised deprecation warning explaining how to transition
-    to the new developer public API from 1.5 to 1.6.
-    """
-
-    class OldEstimator(BaseEstimator):
-        def fit(self, X, y=None):
-            X = self._validate_data(X)
-            self._check_n_features(X, reset=True)
-            self._check_feature_names(X, reset=True)
-            return self
-
-        def transform(self, X):
-            return X  # pragma: no cover
-
-    X, y = make_classification(n_samples=10, n_features=5, random_state=0)
-
-    old_estimator = OldEstimator()
-    with pytest.warns(FutureWarning) as warning_list:
-        old_estimator.fit(X)
-
-    assert len(warning_list) == 3
-    assert str(warning_list[0].message).startswith(
-        "`BaseEstimator._validate_data` is deprecated"
-    )
-    assert str(warning_list[1].message).startswith(
-        "`BaseEstimator._check_n_features` is deprecated"
-    )
-    assert str(warning_list[2].message).startswith(
-        "`BaseEstimator._check_feature_names` is deprecated"
-    )