Skip to content

Commit 1b6c84d

Browse files
nelson-liuamueller
authored andcommitted
fix indent in whats_new and fix indent in datasets/base.py (scikit-learn#7138)
1 parent 0493d71 commit 1b6c84d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

doc/whats_new.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,10 @@ Enhancements
230230
(`#6846 <https://github.com/scikit-learn/scikit-learn/pull/6846>`_)
231231
By `Sebastian Säger`_ and `YenChen Lin`_.
232232

233-
- Added new return type ``(data, target)`` : tuple option to :func:`load_iris` dataset. (`#7049 <https://github.com/scikit-learn/scikit-learn/pull/7049>`_)
234-
By `Manvendra Singh`_ and `Nelson Liu`_.
233+
- Added new return type ``(data, target)`` : tuple option to
234+
:func:`load_iris` dataset.
235+
(`#7049 <https://github.com/scikit-learn/scikit-learn/pull/7049>`_) by
236+
`Manvendra Singh`_.
235237

236238
Bug fixes
237239
.........
@@ -4317,4 +4319,4 @@ David Huard, Dave Morrill, Ed Schofield, Travis Oliphant, Pearu Peterson.
43174319

43184320
.. _Manvendra Singh: https://github.com/manu-chroma
43194321

4320-
.. _Ibraim Ganiev: https://github.com/olologin
4322+
.. _Ibraim Ganiev: https://github.com/olologin

sklearn/datasets/base.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,12 @@ def load_iris(return_X_y=False):
260260
261261
Parameters
262262
----------
263-
264-
.. versionadded:: 0.18
265-
266263
return_X_y : boolean, default=False.
267264
If True, returns ``(data, target)`` instead of a Bunch object.
268265
See below for more information about the `data` and `target` object.
269266
267+
.. versionadded:: 0.18
268+
270269
Returns
271270
-------
272271
data : Bunch
@@ -278,6 +277,8 @@ def load_iris(return_X_y=False):
278277
279278
(data, target) : tuple if ``return_X_y`` is True
280279
280+
.. versionadded:: 0.18
281+
281282
Examples
282283
--------
283284
Let's say you are interested in the samples 10, 25, and 50, and want to

0 commit comments

Comments
 (0)