-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
BUG: Added raising when merging datetime columns with timedelta columns #56613
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 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b296811
Add raising between datetime and timedelta dtype in _MergeOperation
Huanghz2001 7c73dbe
Add entry in release notes
Huanghz2001 534e738
Add test
Huanghz2001 c93a90c
Fixed import order
Huanghz2001 e7ee40e
Modified test to avoid exception message treated as regex
Huanghz2001 5e15146
Merge remote-tracking branch 'upstream/main' into merge_datetime_raising
Huanghz2001 1d38c46
Merge branch 'main' into merge_datetime_raising
Huanghz2001 8325d5b
Merge remote-tracking branch 'upstream/main' into merge_datetime_raising
Huanghz2001 4b8f6bc
Merge remote-tracking branch 'origin/merge_datetime_raising' into mer…
Huanghz2001 f7cb5d5
Check dtype.kind instead of using is_datetime64_dtype() and is_timede…
Huanghz2001 aa9b802
Merge remote-tracking branch 'upstream/main' into merge_datetime_raising
Huanghz2001 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.
Can you check the
dtype.kind
instead of using these methods?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.
Sure! I'll check
dtype.kind
to keep consistent with the logic above.