Skip to content

Commit

Permalink
DOC Ensures that linkage_tree passes numpydoc validation (scikit-lear…
Browse files Browse the repository at this point in the history
…n#21424)

* DOC numpydoc removed linkage_tree from FUNCTION_DOCSTRING_IGNORE_LIST

* DOC numpydoc fixed linkage_tree func docstring
  • Loading branch information
chritter authored Oct 23, 2021
1 parent 9b111a7 commit e4a0bfc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion maint_tools/test_docstrings.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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",
Expand Down
4 changes: 2 additions & 2 deletions sklearn/cluster/_agglomerative.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand Down

0 comments on commit e4a0bfc

Please sign in to comment.