Skip to content

BUG: Fix exceptions when Series.interpolate's order parameter is missing or invalid #25246

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
Feb 11, 2019
Merged

BUG: Fix exceptions when Series.interpolate's order parameter is missing or invalid #25246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
de5b5d2
BUG: raise accurate exception from Series.interpolate (#24014)
nmusolino Feb 9, 2019
5bd3d4d
Actually validate `order` before use in spline
nmusolino Feb 9, 2019
c4ef8e9
Remove unnecessary check and dead code
nmusolino Feb 9, 2019
f6b8907
Clean up comparison/tests based on feedback
nmusolino Feb 10, 2019
c4f3b6d
Include invalid order value in exception
nmusolino Feb 10, 2019
2d5ec0d
Check for NaN order in spline validation
nmusolino Feb 10, 2019
097b9e4
Add whatsnew entry for bug fix
nmusolino Feb 11, 2019
becc36d
CLN: Make unit tests assert one error at a time
nmusolino Feb 11, 2019
33a0de2
CLN: break test into distinct test case
nmusolino Feb 11, 2019
24cd9f5
PEP8 fix in test module
nmusolino Feb 11, 2019
69dd362
CLN: Test fixture for interpolate methods
nmusolino Feb 11, 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
Next Next commit
Check for NaN order in spline validation
  • Loading branch information
@nmusolino
nmusolino committed Feb 10, 2019
commit 2d5ec0d96958020864a92a4d8dba7e21e498aa12
2 changes: 1 addition & 1 deletion pandas/core/missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def _interpolate_scipy_wrapper(x, y, new_x, method, fill_value=None,
new_y = terp(new_x)
elif method == 'spline':
# GH #10633, #24014
if order is None or (order <= 0):
if isna(order) or (order <= 0):
raise ValueError("order needs to be specified and greater than 0; "
"got order: {}".format(order))
terp = interpolate.UnivariateSpline(x, y, k=order, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/series/test_missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,7 @@ def test_no_order(self, method):
s.interpolate(method=method)

@td.skip_if_no_scipy
@pytest.mark.parametrize('order', [-1, -1.0, 0, 0.0])
@pytest.mark.parametrize('order', [-1, -1.0, 0, 0.0, np.nan])
def test_interpolate_spline_invalid_order(self, order):
s = Series([0, 1, np.nan, 3])
msg = "order needs to be specified and greater than 0"
Expand Down