Skip to content

BUG: fix non-existent variable in NDFrame.interpolate #29142

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 11 commits into from
Oct 25, 2019
Merged

BUG: fix non-existent variable in NDFrame.interpolate #29142

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0259cf5
BUG: Fix NDFrame.interpolate non-existent variable #29132
ellequelle Oct 21, 2019
66a1b1a
Merge remote-tracking branch 'upstream/master' into interpbug
ellequelle Oct 22, 2019
b63920b
Removed unreachable else statement in NDFrame.interpolate
ellequelle Oct 22, 2019
e1191b6
Added a test for issue #29142
ellequelle Oct 22, 2019
f8feeb9
Edited test for issue #29142
ellequelle Oct 22, 2019
7331d2d
Adding issue number to test
ellequelle Oct 22, 2019
0a4067b
Edit whatsnew file to reference a user facing method instead of NDFrame
ellequelle Oct 22, 2019
8231559
Added assert_frame_equal to check object returned by interpolate
ellequelle Oct 23, 2019
499147a
Moving GH #29142 to same file as other DataFrame.interpolate tests
ellequelle Oct 23, 2019
d2bb8a0
Moved interpolate axis name tests to a new parametrized function
ellequelle Oct 25, 2019
aae361d
Added RuntimeWarning assertion to test_fillna_categorical_nan
ellequelle Oct 25, 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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.0.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ Bug fixes
~~~~~~~~~

- Bug in :meth:`DataFrame.to_html` when using ``formatters=<list>`` and ``max_cols`` together. (:issue:`25955`)
- Bug in :meth:`DataFrame.interpolate` where specifying axis by name references variable before it is assigned (:issue:`29132`)

Categorical
^^^^^^^^^^^
Expand Down
5 changes: 3 additions & 2 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7023,14 +7023,15 @@ def interpolate(
"""
inplace = validate_bool_kwarg(inplace, "inplace")

axis = self._get_axis_number(axis)

if axis == 0:
ax = self._info_axis_name
_maybe_transposed_self = self
elif axis == 1:
_maybe_transposed_self = self.T
ax = 1
else:
_maybe_transposed_self = self

ax = _maybe_transposed_self._get_axis_number(ax)

if _maybe_transposed_self.ndim == 2:
Expand Down
13 changes: 13 additions & 0 deletions pandas/tests/frame/test_missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ def test_fillna_categorical_nan(self):

result = df.cats.fillna(np.nan)
tm.assert_series_equal(result, df.cats)

result = df.vals.fillna(np.nan)
tm.assert_series_equal(result, df.vals)

Expand Down Expand Up @@ -872,10 +873,22 @@ def test_interp_rowwise(self):
result = df.interpolate(axis=1, method="values")
assert_frame_equal(result, expected)

# GH 29142: test axis names
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rather than adding tests like this, can you create a new test function and paramterize on the axis

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a new parametrized function in the latest commit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pytest is returning with an uncaught warning in the same file from a call to df.median(). Should I add tm.assert_produces_warning()?

pandas/tests/frame/test_missing.py::TestDataFrameMissingData::test_fillna_categorical_nan
python3.7/site-packages/numpy/lib/nanfunctions.py:1115: RuntimeWarning: All-NaN slice encountered
    overwrite_input=overwrite_input)

result = df.interpolate(axis="columns", method="values")
assert_frame_equal(result, expected)

result = df.interpolate(axis=0)
expected = df.interpolate()
assert_frame_equal(result, expected)

# GH 29142: test axis names
result = df.interpolate(axis="rows", method="values")
assert_frame_equal(result, expected)

# GH 29142: test axis names
result = df.interpolate(axis="index", method="values")
assert_frame_equal(result, expected)

def test_rowwise_alt(self):
df = DataFrame(
{
Expand Down