39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
|
From 3e48312c41cb26bbd4dc83ae286444f1469b7aa2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maximilian Roos <m@maxroos.com>
|
||
|
|
Date: Fri, 1 Sep 2023 19:41:41 -0700
|
||
|
|
Subject: [PATCH] Fix pandas interpolate(fill_value=) error
|
||
|
|
|
||
|
|
Pandas no longer has a `fill_value` parameter for `interpolate`.
|
||
|
|
|
||
|
|
Weirdly I wasn't getting this locally, on pandas 2.1.0, only in CI on https://github.com/pydata/xarray/actions/runs/6054400455/job/16431747966?pr=8138.
|
||
|
|
|
||
|
|
Removing it passes locally, let's see whether this works in CI
|
||
|
|
---
|
||
|
|
xarray/tests/test_missing.py | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/xarray/tests/test_missing.py b/xarray/tests/test_missing.py
|
||
|
|
index a6b6b1f80c..c303659116 100644
|
||
|
|
--- a/xarray/tests/test_missing.py
|
||
|
|
+++ b/xarray/tests/test_missing.py
|
||
|
|
@@ -104,7 +104,8 @@ def test_interpolate_pd_compat():
|
||
|
|
for dim in ["time", "x"]:
|
||
|
|
actual = da.interpolate_na(method=method, dim=dim, fill_value=np.nan)
|
||
|
|
expected = df.interpolate(
|
||
|
|
- method=method, axis=da.get_axis_num(dim), fill_value=(np.nan, np.nan)
|
||
|
|
+ method=method,
|
||
|
|
+ axis=da.get_axis_num(dim),
|
||
|
|
)
|
||
|
|
# Note, Pandas does some odd things with the left/right fill_value
|
||
|
|
# for the linear methods. This next line inforces the xarray
|
||
|
|
@@ -140,7 +141,8 @@ def test_interpolate_pd_compat_non_uniform_index():
|
||
|
|
method="linear", dim=dim, use_coordinate=True, fill_value=np.nan
|
||
|
|
)
|
||
|
|
expected = df.interpolate(
|
||
|
|
- method=method, axis=da.get_axis_num(dim), fill_value=np.nan
|
||
|
|
+ method=method,
|
||
|
|
+ axis=da.get_axis_num(dim),
|
||
|
|
)
|
||
|
|
|
||
|
|
# Note, Pandas does some odd things with the left/right fill_value
|