other merge conflicts

glemaitre · glemaitre · commit 54c94da7cf7a · 2022-08-05T14:58:55.000+02:00
diff --git a/sklearn/cluster/tests/test_birch.py b/sklearn/cluster/tests/test_birch.py
@@ -14,6 +14,7 @@
 from sklearn.linear_model import ElasticNet
 from sklearn.metrics import pairwise_distances_argmin, v_measure_score
 
+from sklearn.utils._testing import assert_allclose
 from sklearn.utils._testing import assert_almost_equal
 from sklearn.utils._testing import assert_array_equal
 from sklearn.utils._testing import assert_array_almost_equal
diff --git a/sklearn/decomposition/tests/test_nmf.py b/sklearn/decomposition/tests/test_nmf.py
@@ -56,7 +56,7 @@ def test_parameter_checking():
         # TODO remove in 1.2
         msg = "Invalid regularization parameter: got 'spam' instead of one of"
         with pytest.raises(ValueError, match=msg):
-            NMF(regularization=name).fit(A)
+            NMF(regularization="spam").fit(A)
 
     msg = "Invalid beta_loss parameter: solver 'cd' does not handle beta_loss = 1.0"
     with pytest.raises(ValueError, match=msg):
