From 088b7458783e66dc92f7ed9b69b37334d797b3937eaa8ff0088ad3d506e22975 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 20 Dec 2023 20:40:51 +0000 Subject: [PATCH] remove patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-xarray?expand=0&rev=85 --- python-xarray.spec | 2 -- xarray-pr8139-pandas-fill_value.patch | 38 --------------------------- 2 files changed, 40 deletions(-) delete mode 100644 xarray-pr8139-pandas-fill_value.patch diff --git a/python-xarray.spec b/python-xarray.spec index c0810d0..658d69f 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -27,8 +27,6 @@ Source: https://files.pythonhosted.org/packages/source/x/xarray/xarray-% # PATCH-FEATURE-UPSTREAM local_dataset.patch gh#pydata/xarray#5377 mcepl@suse.com # fix xr.tutorial.open_dataset to work with the preloaded cache. Patch0: local_dataset.patch -# PATCH-FIX-UPSTREAM xarray-pr8139-pandas-fill_value.patch gh#pydata/xarray#8125, gh#pydata/xarray#8139 -#Patch1: https://github.com/pydata/xarray/pull/8139.patch#/xarray-pr8139-pandas-fill_value.patch BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module numpy-devel >= 1.22} BuildRequires: %{python_module packaging >= 21.3} diff --git a/xarray-pr8139-pandas-fill_value.patch b/xarray-pr8139-pandas-fill_value.patch deleted file mode 100644 index 0b59437..0000000 --- a/xarray-pr8139-pandas-fill_value.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3e48312c41cb26bbd4dc83ae286444f1469b7aa2 Mon Sep 17 00:00:00 2001 -From: Maximilian Roos -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