-
- Notifications
You must be signed in to change notification settings - Fork 19.4k
BUG: Raise ValueError for non numerical join columns in merge_asof #34488
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
jreback merged 30 commits into pandas-dev:master from phofl:29130_raise_value_error_non_numerical Jan 6, 2021
Merged
Changes from 1 commit
Commits
Show all changes
30 commits Select commit Hold shift + click to select a range
660d2f5 Raise ValueError for non numerical join columns in merge_asof
phofl cafedcc Delete unused imports
phofl fa1d909 Implement review requests
phofl 34a5633 Run black pandas
phofl 783bc60 Change error message
phofl e086864 Change whats new entry
phofl a4001c6 Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl aaa3480 Change error type
phofl ec3147e Move dtype check
phofl 129eb77 Use raw string
phofl 4680833 Move check again
phofl fb55c9f Move dtype check to _get_merge_keys
phofl 72fb8b4 Run black pandas
phofl 0103974 Overwrite _maybe_coerce_merge_keys
phofl 4cc8bdc Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl a6048a6 Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl cdaa8ef Move whats new entry
phofl 47e211c Add docs from other pr
phofl 3129353 Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl 0242f47 Run black pandas
phofl ef47721 Revert "Add docs from other pr"
phofl 109c824 Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl 3a66f05 Move whatsnew
phofl da377c7 Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl c0ce857 Move merge asof validation
phofl 2c164c5 Remove newline
phofl a00eb9c Parametrize test further
phofl f62a873 Merge branch 'master' of https://github.com/pandas-dev/pandas into 29130
phofl 4782233 Add comment
phofl 6ebb7a3 Change Error
phofl 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
Move dtype check to _get_merge_keys
- Loading branch information
commit fb55c9f094a0e3ef5cd4fb63081e98c346d42e7c
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
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.
no, we don't want to do this.
put your changes in the super call to _get_merge_keys. just do it upfront (that is what was not clear before).
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.
I think you mean _maybe_coerce_merge_keys then? The dtype validation for the regular merge is done there.
The _get_merge_keys function I changed is already from _AsOfMerge, so I could not overwrite this again. This function overwrites the original _get_merge_keys function and calls the super() function before checking if both join cols have the same dtype