-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
DOC: fix EX02 errors in docstrings #51369
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.
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
Closed
natmokval
wants to merge
8
commits into
pandas-dev:main
from
natmokval:51236-EX02-errors-docstrings-IV
Closed
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
4e7ace9
DOC: fix EX02 errors in docstrings IV
natmokval 55cbf75
add doctest skip
natmokval f1d2486
Merge branch 'main' into 51236-EX02-errors-docstrings-IV
natmokval a5f616d
Merge branch 'main' into 51236-EX02-errors-docstrings-IV
natmokval 3324424
Resolve merge conflict
natmokval 7da751c
add doctest skip II
natmokval 46e2048
Merge remote-tracking branch 'upstream/main' into pr/natmokval/51236-…
ad95c49
post-merge fixup
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this intentional? looks like you're adding
pandas.Series.sparse.sp_values
to the ignore list - perhaps something didn't go quite right when merging?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It wasn't intentional. I am not very familiar with resolving merge conflicts.
While I was working on the PR the functions
pandas.Series.sparse.density
,pandas.Series.sparse.npoints
,pandas.Series.sparse.sp_values
were in the ignore list. I deleted these functions from the ignore list in my next PR, which has been merged just a couple of hours ago. To resolve the conflict I have to delete these functions now.I can do it locally and push a new commit. What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good, thanks!