Skip to content

DOC: Numpydoc format. #17894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 14, 2020
Merged

DOC: Numpydoc format. #17894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb25775
DOC: Numpydoc format.
Carreau Jul 12, 2020
4517a7c
Update lib/matplotlib/__init__.py
Carreau Jul 12, 2020
ef9343c
sync with matplotlib.axes.Axes.cohere
Carreau Jul 12, 2020
55e3cce
Update lib/matplotlib/__init__.py
Carreau Jul 12, 2020
ef0e10d
rewrap
Carreau Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/matplotlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,10 @@ def _get_executable_info(name):

Returns
-------
If the executable is found, a namedtuple with fields ``executable`` (`str`)
and ``version`` (`distutils.version.LooseVersion`, or ``None`` if the
version cannot be determined).
tuple
A namedtuple with fields ``executable`` (`str`) and ``version``
(`distutils.version.LooseVersion`, or ``None`` if the version cannot be
determined).

Raises
------
Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/mlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,10 +934,10 @@ def cohere(x, y, NFFT=256, Fs=2, detrend=detrend_none, window=window_hanning,

Returns
-------
The return value is the tuple (*Cxy*, *f*), where *f* are the
frequencies of the coherence vector. For cohere, scaling the
individual densities by the sampling frequency has no effect,
since the factors cancel out.
Cxy : 1-D array
The coherence vector.
freqs : 1-D array
The frequencies for the elements in *Cxy*.

See Also
--------
Expand Down