MAINT Parameters validation for datasets.make_moons (scikit-learn#25971)

Théophile Baranger · Itay · commit dd6e21099b9b · 2023-04-15T23:06:52.000+03:00
diff --git a/sklearn/datasets/_samples_generator.py b/sklearn/datasets/_samples_generator.py
@@ -778,6 +778,14 @@ def make_circles(
     return X, y
 
 
+@validate_params(
+    {
+        "n_samples": [Interval(Integral, 1, None, closed="left"), tuple],
+        "shuffle": ["boolean"],
+        "noise": [Interval(Real, 0, None, closed="left"), None],
+        "random_state": ["random_state"],
+    }
+)
 def make_moons(n_samples=100, *, shuffle=True, noise=None, random_state=None):
     """Make two interleaving half circles.
 
diff --git a/sklearn/datasets/tests/test_samples_generator.py b/sklearn/datasets/tests/test_samples_generator.py
@@ -636,12 +636,6 @@ def test_make_moons_unbalanced():
     assert X.shape == (12, 2), "X shape mismatch"
     assert y.shape == (12,), "y shape mismatch"
 
-    with pytest.raises(
-        ValueError,
-        match=r"`n_samples` can be either an int " r"or a two-element tuple.",
-    ):
-        make_moons(n_samples=[1, 2, 3])
-
     with pytest.raises(
         ValueError,
         match=r"`n_samples` can be either an int " r"or a two-element tuple.",
diff --git a/sklearn/tests/test_public_functions.py b/sklearn/tests/test_public_functions.py
@@ -137,6 +137,7 @@ def _check_function_param_validation(
     "sklearn.datasets.make_gaussian_quantiles",
     "sklearn.datasets.make_hastie_10_2",
     "sklearn.datasets.make_low_rank_matrix",
+    "sklearn.datasets.make_moons",
     "sklearn.datasets.make_multilabel_classification",
     "sklearn.datasets.make_regression",
     "sklearn.datasets.make_sparse_coded_signal",
