Back to the original branch because I had modified it unintentionally

cathelineparisot · cathelineparisot · commit 4046912ff188 · 2022-01-10T03:14:31.000+01:00
diff --git a/sklearn/pipeline.py b/sklearn/pipeline.py
@@ -201,6 +201,7 @@ def _validate_steps(self):
         for t in transformers:
             if t is None or t == "passthrough":
                 continue
+<<<<<<< HEAD
 <<<<<<< HEAD
             if (not hasattr(t, "fit_transform") and
                     (not hasattr(t, "fit") and hasattr(t, "transform"))):
@@ -210,6 +211,8 @@ def _validate_steps(self):
                                 "'passthrough'. '%s' (type %s) doesn't"
                                 % (t, type(t)))
 =======
+=======
+>>>>>>> parent of 3b294b20d... [fix]allow-when-only-fit-transform
             if not (hasattr(t, "fit") or hasattr(t, "fit_transform")) or not hasattr(
                 t, "transform"
             ):
@@ -228,11 +231,14 @@ def _validate_steps(self):
             and not hasattr(estimator, "fit")
         ):
             raise TypeError(
+<<<<<<< HEAD
 <<<<<<< HEAD
                 "Last step of Pipeline should implement fit, "
                 "fit_transform or be the string 'passthrough'. "
                 "'%s' (type %s) doesn't" % (estimator, type(estimator)))
 =======
+=======
+>>>>>>> parent of 3b294b20d... [fix]allow-when-only-fit-transform
                 "Last step of Pipeline should implement fit "
                 "or be the string 'passthrough'. "
                 "'%s' (type %s) doesn't" % (estimator, type(estimator))
