-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: fix Series[timedelta64] arithmetic with Timedelta scalars #18831
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
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
1eab96f
Fix Series timedelta64 // timedelta
jbrockmendel 25071a8
allow rtruediv
jbrockmendel 45c7260
amend test case with pytimedelta, timedelta64
jbrockmendel 95cc5f9
dummy commit to force CI
jbrockmendel 6ff2d5f
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 4fe8f74
xfail test
jbrockmendel 4821f05
floordiv example in timedeltas.rst, move whatsnew note to conversion …
jbrockmendel 10054de
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 66561ef
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 347a221
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 8789be7
edit issue reference
jbrockmendel c3795d0
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel ef8d6e2
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 2b3484f
re-implement tests lost in rebase/merge mixups
jbrockmendel 3250913
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 3a5c3b5
Merge branch 'master' of https://github.com/pandas-dev/pandas into ti…
jbrockmendel 729d240
separate explicit rfloordiv test
jbrockmendel 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
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.
floordiv -> rfloordiv
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.
? Both
Timedelta.__floordiv__
andTimedelta.__rfloordiv__
are wonky. Or are you referring to something else?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.
you reason is wrong, it should be rfloordiv
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.
You mean the
reason="Timedelta.__floordiv__
...? The test fails becauseTimedelta.__floordiv__
gets called, notTimedelta.__rfloordiv__
.