[rpms/python-xarray] rawhide: Revert "Adjust TestDataset.test_repr for Pandas 3.0.3"

[rpms/python-xarray] rawhide: Revert "Adjust TestDataset.test_repr for Pandas 3.0.3"

[@ 2026-06-22 16:41 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/python-xarray
            Branch : rawhide
            Commit : 39874d33f0efc01e01c3c5e21e102f67b0d3a8ef
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2026-06-22T09:55:28+02:00
            Stats  : +3/-26 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-xarray/c/39874d33f0efc01e01c3c5e21e102f67b0d3a8ef?branch=rawhide

            Log:
            Revert "Adjust TestDataset.test_repr for Pandas 3.0.3"

This reverts commit e9a8d2cb45df5e81d47dfdd76245ff91abd64cd2.

Apparently, the previous fix only worked for the bootstrap build.

Now we skip the test when --with bootstrap instead.

---
diff --git a/11384.patch b/11384.patch
deleted file mode 100644
index 0d23933..0000000
--- a/11384.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ca8240081ea9585be3c2e3112014d1c9f8e1150c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Sat, 13 Jun 2026 12:35:34 +0200
-Subject: [PATCH] Adjust TestDataset.test_repr for Pandas 3.0.3
-
-Not sure if 3.0.3 is the bordering version,
-but with it, we saw a test failure in Fedora.
----
- xarray/tests/test_dataset.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xarray/tests/test_dataset.py b/xarray/tests/test_dataset.py
-index cd4f2c10eb2..2abab85b946 100644
---- a/xarray/tests/test_dataset.py
-+++ b/xarray/tests/test_dataset.py
-@@ -301,7 +301,7 @@ def test_repr(self) -> None:
-                 var1     (dim1, dim2) float64 576B -0.9891 -0.3678 1.288 ... -0.2116 0.364
-                 var2     (dim1, dim2) float64 576B 0.953 1.52 1.704 ... 0.1347 -0.6423
-                 var3     (dim3, dim1) float64 640B 0.4107 0.9941 0.1665 ... 0.716 1.555
--                var4     (dim1) category 3{6 if Version(pd.__version__) >= Version("3.0.0dev0") else 2}B b c b a c a c a{var5}
-+                var4     (dim1) category 3{6 if Version("3.0.3") > Version(pd.__version__) >= Version("3.0.0dev0") else 2}B b c b a c a c a{var5}
-             Attributes:
-                 foo:      bar"""
-         )

diff --git a/python-xarray.spec b/python-xarray.spec
index 94bc11b..407d936 100644
--- a/python-xarray.spec
+++ b/python-xarray.spec
@@ -19,8 +19,6 @@ Source:         %pypi_source %{srcname}
 Patch:          0001-Drop-pydap-from-dependencies.patch
 # Fix failures with latest dependencies.
 Patch:          https://github.com/pydata/xarray/pull/11204.patch
-# Adjust TestDataset.test_repr for Pandas 3.0.3
-Patch:          https://github.com/pydata/xarray/pull/11384.patch
 
 BuildArch:      noarch
 
@@ -87,6 +85,9 @@ k="${k-}${k+ and }not test_save_mfdataset_compute_false_roundtrip"
 %if %{without dask}
 k="${k-}${k+ and }not test_source_encoding_always_present_with_fsspec"
 k="${k-}${k+ and }not test_h5netcdf_storage_options"
+# The following test does not need dask, but fails without it,
+# see https://github.com/pydata/xarray/pull/11384
+k="${k-}${k+ and }not (TestDataset and test_repr)"
 %endif
 
 %{pytest} -ra -n auto -m "not network" ${k:+-k "${k}"} --pyargs xarray --timeout 300 --full-trace