From 2655ea1f16d0951a9efb82459194f2be22e917fe Mon Sep 17 00:00:00 2001 From: chritter Date: Sat, 23 Oct 2021 10:39:03 -0400 Subject: [PATCH 1/2] DOC numpydoc removed linkage_tree from FUNCTION_DOCSTRING_IGNORE_LIST --- maint_tools/test_docstrings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/maint_tools/test_docstrings.py b/maint_tools/test_docstrings.py index a658f13ac8912..55e7c3e18fbde 100644 --- a/maint_tools/test_docstrings.py +++ b/maint_tools/test_docstrings.py @@ -23,7 +23,6 @@ "sklearn._config.get_config", "sklearn.base.clone", "sklearn.cluster._affinity_propagation.affinity_propagation", - "sklearn.cluster._agglomerative.linkage_tree", "sklearn.cluster._kmeans.k_means", "sklearn.cluster._kmeans.kmeans_plusplus", "sklearn.cluster._mean_shift.estimate_bandwidth", From 680715af035f85789111aed0eca2dd535a27f4e6 Mon Sep 17 00:00:00 2001 From: chritter Date: Sat, 23 Oct 2021 12:09:09 -0400 Subject: [PATCH 2/2] DOC numpydoc fixed linkage_tree func docstring --- sklearn/cluster/_agglomerative.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sklearn/cluster/_agglomerative.py b/sklearn/cluster/_agglomerative.py index 01799048a7f6b..a4a22c73e182f 100644 --- a/sklearn/cluster/_agglomerative.py +++ b/sklearn/cluster/_agglomerative.py @@ -429,11 +429,11 @@ def linkage_tree( observations of the two sets. affinity : str or callable, default='euclidean' - which metric to use. Can be 'euclidean', 'manhattan', or any + Which metric to use. Can be 'euclidean', 'manhattan', or any distance known to paired distance (see metric.pairwise). return_distance : bool, default=False - whether or not to return the distances between the clusters. + Whether or not to return the distances between the clusters. Returns -------