1
0
forked from pool/python-pandas

Accepting request 1199479 from devel:languages:python:numeric

OBS-URL: https://build.opensuse.org/request/show/1199479
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pandas?expand=0&rev=69
This commit is contained in:
Ana Guerrero 2024-09-10 19:12:17 +00:00 committed by Git OBS Bridge
commit 6789fc612d
3 changed files with 7 additions and 43 deletions

View File

@ -1,41 +0,0 @@
From d36f6dac81b577504386b53357270d9f05a9bc89 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Tue, 14 May 2024 09:04:20 -1000
Subject: [PATCH] Backport PR #58719: CI: xfail test_to_xarray_index_types due
to new 2024.5 release
---
pandas/tests/generic/test_to_xarray.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pandas/tests/generic/test_to_xarray.py b/pandas/tests/generic/test_to_xarray.py
index d8401a8b2ae3f..491f621783a76 100644
--- a/pandas/tests/generic/test_to_xarray.py
+++ b/pandas/tests/generic/test_to_xarray.py
@@ -9,6 +9,7 @@
date_range,
)
import pandas._testing as tm
+from pandas.util.version import Version
pytest.importorskip("xarray")
@@ -29,11 +30,17 @@ def df(self):
}
)
- def test_to_xarray_index_types(self, index_flat, df, using_infer_string):
+ def test_to_xarray_index_types(self, index_flat, df, using_infer_string, request):
index = index_flat
# MultiIndex is tested in test_to_xarray_with_multiindex
if len(index) == 0:
pytest.skip("Test doesn't make sense for empty index")
+ import xarray
+
+ if Version(xarray.__version__) >= Version("2024.5"):
+ request.applymarker(
+ pytest.mark.xfail(reason="https://github.com/pydata/xarray/issues/9026")
+ )
from xarray import Dataset

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Sep 8 10:02:47 UTC 2024 - Ben Greiner <code@bnavigator.de>
- Drop pandas-pr58720-xarray-dp.patch: It does no longer xfail
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 28 13:53:55 UTC 2024 - Ben Greiner <code@bnavigator.de> Wed Aug 28 13:53:55 UTC 2024 - Ben Greiner <code@bnavigator.de>

View File

@ -71,8 +71,6 @@ URL: https://pandas.pydata.org/
Source0: pandas-%{version}.tar.gz Source0: pandas-%{version}.tar.gz
# PATCH-FIX-UPSTREAM pandas-pr58269-pyarrow16xpass.patch -- gh#pandas-dev/pandas#58269 # PATCH-FIX-UPSTREAM pandas-pr58269-pyarrow16xpass.patch -- gh#pandas-dev/pandas#58269
Patch0: pandas-pr58269-pyarrow16xpass.patch Patch0: pandas-pr58269-pyarrow16xpass.patch
# PATCH-FIX-UPSTREAM pandas-pr58720-xarray-dp.patch -- gh#pandas-dev/pandas#58720 mcepl@suse.com, make pandas compatible with the modern xarray
Patch1: pandas-pr58720-xarray-dp.patch
# PATCH-FIX-UPSTREAM pandas-pr58484-matplotlib.patch -- gh#pandas-dev/pandas#58484 mcepl@suse.com, make pandas compatible with the modern matplotlib # PATCH-FIX-UPSTREAM pandas-pr58484-matplotlib.patch -- gh#pandas-dev/pandas#58484 mcepl@suse.com, make pandas compatible with the modern matplotlib
Patch2: pandas-pr58484-matplotlib.patch Patch2: pandas-pr58484-matplotlib.patch
# PATCH-FIX-UPSTREAM pandas-pr59175-matplotlib.patch -- gh#pandas-dev/pandas#59175 # PATCH-FIX-UPSTREAM pandas-pr59175-matplotlib.patch -- gh#pandas-dev/pandas#59175
@ -547,6 +545,8 @@ SKIP_TESTS+=" or numba"
%ifarch %{ix86} %ifarch %{ix86}
# overflows on i586 # overflows on i586
SKIP_TESTS+=" or test_encode_non_c_locale" SKIP_TESTS+=" or test_encode_non_c_locale"
# intp != int32 (still numpy 1)?
SKIP_TESTS+=" or test_ensure_platform_int"
# fails on i586 (was gcc10-skip-one-test.patch) # fails on i586 (was gcc10-skip-one-test.patch)
SKIP_TESTS+=" or test_merge_on_ints_floats_warning" SKIP_TESTS+=" or test_merge_on_ints_floats_warning"
%endif %endif