fix biclustering API (scikit-learn#9053)

amueller · AishwaryaRK · commit 7c1197749d58 · 2017-08-29T09:58:55.000+05:30
don't mention returning self in whatsnew as that's already fixed in master
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -419,6 +419,10 @@ API changes summary
      has been renamed to ``n_components`` and will be removed in version 0.21.
      :issue:`8922` by :user:Attractadore
 
+   - :class:`cluster.bicluster.SpectralCoClustering` and
+     :class:`cluster.bicluster.SpectralBiclustering` now accept ``y`` in fit.
+     :issue:`6126` by `Andreas Müller`_.
+
    - SciPy >= 0.13.3 and NumPy >= 1.8.2 are now the minimum supported versions
      for scikit-learn. The following backported functions in ``sklearn.utils``
      have been removed or deprecated accordingly.
diff --git a/sklearn/cluster/bicluster.py b/sklearn/cluster/bicluster.py
@@ -110,7 +110,7 @@ def _check_parameters(self):
                              " one of {1}.".format(self.svd_method,
                                                    legal_svd_methods))
 
-    def fit(self, X):
+    def fit(self, X, y=None):
         """Creates a biclustering for X.
 
         Parameters
diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py
@@ -470,12 +470,7 @@ def check_dict_unchanged(name, Estimator):
 
     set_random_state(estimator, 1)
 
-    # should be just `estimator.fit(X, y)`
-    # after merging #6141
-    if name in ['SpectralBiclustering']:
-        estimator.fit(X)
-    else:
-        estimator.fit(X, y)
+    estimator.fit(X, y)
     for method in ["predict", "transform", "decision_function",
                    "predict_proba"]:
         if hasattr(estimator, method):
