8000 DOC: Fix order section in docstrings (part II) by alexander-ponomaroff · Pull Request #24132 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

DOC: Fix order section in docstrings (part II) #24132

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 6 commits into from
Dec 16, 2018
Merged

DOC: Fix order section in docstrings (part II) #24132

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6efd5f5
More GL07 error fixes
alexander-ponomaroff Dec 6, 2018
65ebcda
merge
alexander-ponomaroff Dec 7, 2018
680c1c4
undo and merge
alexander-ponomaroff Dec 7, 2018
211d8ad
Merge remote-tracking branch 'upstream/master' into err2
datapythonista Dec 11, 2018
5c54db8
Fixing docstring order (and test because NaT and Timestamp docstring …
datapythonista Dec 14, 2018
6a9da48
Merge remote-tracking branch 'upstream/master' into err2
datapythonista Dec 14, 2018
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
Prev Previous commit
Next Next commit
Fixing docstring order (and test because NaT and Timestamp docstring … 
…did not match)
  • Loading branch information
@datapythonista
datapythonista committed Dec 14, 2018
commit 5c54db87e93723471a9e9f066d11a85610fb08d5
8 changes: 4 additions & 4 deletions pandas/_libs/tslibs/nattype.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,6 @@ class NaTType(_NaT):
"""
Round the Timestamp to the specified resolution

Returns
-------
a new Timestamp rounded to the given resolution of `freq`

Parameters
----------
freq : a freq string indicating the rounding resolution
Expand All @@ -497,6 +493,10 @@ class NaTType(_NaT):

.. versionadded:: 0.24.0

Returns
-------
a new Timestamp rounded to the given resolution of `freq`

Raises
------
ValueError if the freq cannot be converted
Expand Down
0