BUG: in DataFrame.reset_index() only call maybe_upcast_putmask with ndarrays #36876
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
jreback
added
Bug
Categorical
jreback
requested changes
Oct 7, 2020
| @@ -650,6 +650,32 @@ def test_loc_slice(self): | |||
| expected = self.df.iloc[[2, 3, 4]] | |||
| tm.assert_frame_equal(result, expected) | |||
|
|
|||
| def test_reindexing_with_missing_values(self): | |||
There was a problem hiding this comment.
can you parameterize both of the examples from the OP.
| @@ -650,6 +650,32 @@ def test_loc_slice(self): | |||
| expected = self.df.iloc[[2, 3, 4]] | |||
| tm.assert_frame_equal(result, expected) | |||
|
|
|||
| def test_reindexing_with_missing_values(self): | |||
There was a problem hiding this comment.
move to pandas/tests/frame/test_alter_axes.py
you can make a new class there if you'd like and put this there
| } | ||
| ) | ||
|
|
||
| tm.assert_frame_equal(res, expected) |
There was a problem hiding this comment.
can you also round-trip again, e.g. .set_index(['level_0', 'level_1']).reset_index() and compare with expected.
5 tasks
arw2019
commented
Oct 9, 2020
| @@ -650,6 +650,32 @@ def test_loc_slice(self): | |||
| expected = self.df.iloc[[2, 3, 4]] | |||
| tm.assert_frame_equal(result, expected) | |||
|
|
|||
| def test_reindexing_with_missing_values(self): | |||
| @@ -650,6 +650,32 @@ def test_loc_slice(self): | |||
| expected = self.df.iloc[[2, 3, 4]] | |||
| tm.assert_frame_equal(result, expected) | |||
|
|
|||
| def test_reindexing_with_missing_values(self): | |||
| } | ||
| ) | ||
|
|
||
| tm.assert_frame_equal(res, expected) |
| @@ -171,21 +173,6 @@ def test_assign_columns(self, float_frame): | |||
| tm.assert_series_equal(float_frame["C"], df["baz"], check_names=False) | |||
| tm.assert_series_equal(float_frame["hi"], df["foo2"], check_names=False) | |||
|
|
|||
| def test_set_index_preserve_categorical_dtype(self): | |||
There was a problem hiding this comment.
I moved this to sit with the only other categorical test (the one I'm adding) in TestCategoricalIndex class
pandas/core/frame.py
Outdated
| if mask.any(): | ||
| if isinstance(values, np.ndarray): | ||
| values, _ = maybe_upcast_putmask(values, mask, np.nan) | ||
| else: |
There was a problem hiding this comment.
@jreback added this since you last looked - we handle nan in maybe_upcast_mask if values is an ndarray else fill with np.nan
jreback
approved these changes
Oct 10, 2020
|
can you merge master and ping on green-ish |
|
@jreback Green-ish (the failures are 6 tests from |
|
@jreback all green now |
|
thanks @arw2019 |
|
Thanks @jreback for reviewing! |
JulianWgs
pushed a commit
to JulianWgs/pandas
that referenced
this pull request
Oct 26, 2020
…darrays (pandas-dev#36876) * BUG: add check so maybe_upcast_putmask is only called with ndarray * TST: add tests * DOC: add whatsnew * feedback: test roundtrip * feedback: parametrize on both examples from OP * move test to frame/test_alter_axes.py * fill mask in index with nan when not calling maybe_upcast_putmask * restore the fix
kesmit13
pushed a commit
to kesmit13/pandas
that referenced
this pull request
Nov 2, 2020
…darrays (pandas-dev#36876) * BUG: add check so maybe_upcast_putmask is only called with ndarray * TST: add tests * DOC: add whatsnew * feedback: test roundtrip * feedback: parametrize on both examples from OP * move test to frame/test_alter_axes.py * fill mask in index with nan when not calling maybe_upcast_putmask * restore the fix
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diff