8000 REF: shift ravel in infer_dtype by h-vetinari · Pull Request #24560 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

REF: shift ravel in infer_dtype #24560

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 3 commits into from
Jan 3, 2019
Merged

REF: shift ravel in infer_dtype #24560

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
504130b
REF: shift ravel in infer_dtype
h-vetinari Jan 2, 2019
5fb02b8
Fix oversight
h-vetinari Jan 2, 2019
a040325
Merge remote-tracking branch 'upstream/master' into infer_skipna_ravel
h-vetinari Jan 3, 2019
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
Merge remote-tracking branch 'upstream/master' into infer_skipna_ravel
  • Loading branch information
@h-vetinari
h-vetinari committed Jan 3, 2019
commit a0403251f825fc163d09845fb00698ffa25aa7d2
2 changes: 1 addition & 1 deletion pandas/core/reshape/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ def _maybe_coerce_merge_keys(self):
# let's infer and see if we are ok
elif (lib.infer_dtype(lk, skipna=False)
== lib.infer_dtype(rk, skipna=False)):
pass
continue

# Check if we are trying to merge on obviously
# incompatible dtypes GH 9780, GH 15800
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0