BUG: Merge with str/StringDtype keys and multiindex #43785
Merged
Conversation
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
Contributor
benoit9126
commented
Sep 28, 2021
benoit9126
commented
- closes BUG: Merge with EA and MultiIndex #43734
- tests added / passed
- Ensure all linting tests pass, see here for how to run them
- whatsnew entry
benoit9126
changed the title
jreback
requested changes
Sep 29, 2021
| @@ -1885,6 +1885,17 @@ def test_dtype_on_merged_different(self, change, join_type, left, right): | |||
| ) | |||
| tm.assert_series_equal(result, expected) | |||
|
|
|||
| # GH 43734 Avoid the use of `assign` with multiindex | |||
There was a problem hiding this comment.
I created a new test and I parametrized the Python string data type (as you proposed) and the join type (as it was in the test I originally inserted this fragment of code)
| @@ -1885,6 +1885,17 @@ def test_dtype_on_merged_different(self, change, join_type, left, right): | |||
| ) | |||
| tm.assert_series_equal(result, expected) | |||
|
|
|||
| # GH 43734 Avoid the use of `assign` with multiindex | |||
| right.columns = MultiIndex.from_tuples([("lvl0", x) for x in right.columns]) | |||
| left.columns = MultiIndex.from_tuples([("lvl0", x) for x in left.columns]) | |||
There was a problem hiding this comment.
this doesn't appear to actually be testing the OP, e.g. that's where the dtype is str vs StringDtype(). can you parameterize and show the dataframe construction.
jreback
added
Dtype Conversions
phofl
reviewed
Oct 3, 2021
doc/source/whatsnew/v1.4.0.rst
Outdated
| @@ -502,6 +502,7 @@ Reshaping | |||
| - Bug in :func:`concat` of ``bool`` and ``boolean`` dtypes resulting in ``object`` dtype instead of ``boolean`` dtype (:issue:`42800`) | |||
| - Bug in :func:`crosstab` when inputs are are categorical Series, there are categories that are not present in one or both of the Series, and ``margins=True``. Previously the margin value for missing categories was ``NaN``. It is now correctly reported as 0 (:issue:`43505`) | |||
| - Bug in :func:`concat` would fail when the ``objs`` argument all had the same index and the ``keys`` argument contained duplicates (:issue:`43595`) | |||
| - Fixed bug in :meth:`merge` with multi-index as column index for the ``on`` argument returning an error when assigning a column internally (:issue:`43734`) | |||
phofl
reviewed
Oct 3, 2021
phofl
reviewed
Oct 3, 2021
phofl
reviewed
Oct 4, 2021
| assert (df2.dtypes == np.dtype("O")).all() | ||
|
|
||
| # Check the expected types for the merged data frame | ||
| result = merged.dtypes.sort_index() |
There was a problem hiding this comment.
Don't use sort, just define expected correctly
There was a problem hiding this comment.
I picked this way of doing in the class TestMergeCategorical (in the same file). Done.
phofl
reviewed
Oct 4, 2021
| merged = merge(left=df1, right=df2, on=[("lvl0", "lvl1-a")], how=join_type) | ||
|
|
||
| # No change in df1 and df2 types | ||
| assert (df1.dtypes == pd.StringDtype()).all() |
jreback
requested changes
Oct 11, 2021
| @@ -2598,3 +2598,38 @@ def test_merge_outer_with_NaN(dtype): | |||
| dtype=dtype, | |||
| ) | |||
| tm.assert_frame_equal(result, expected) | |||
|
|
|||
|
|
|||
| @pytest.mark.parametrize("string_dtype", tm.STRING_DTYPES) | |||
There was a problem hiding this comment.
string_dtype is already a fixture so kill this line (and will still work).
There was a problem hiding this comment.
Sorry, I did not see it. I will simplify the code.
jreback
approved these changes
Oct 16, 2021
|
thanks @benoit9126 very nice |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.