Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

- Resolves: rhbz#2419634

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -24,3 +24,12 @@
 /xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz
 /xarray-2023.7.0.tar.gz
 /xarray-2023.8.0.tar.gz
+/xarray-2023.9.0.tar.gz
+/xarray-2024.6.0.tar.gz
+/xarray-2024.7.0.tar.gz
+/xarray-2024.10.0.tar.gz
+/xarray-2025.1.1.tar.gz
+/xarray-2025.4.0.tar.gz
+/xarray-2025.9.0.tar.gz
+/xarray-2025.11.0.tar.gz
+/xarray-2025.12.0.tar.gz

.packit.yaml

@@ -0,0 +1,18 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+---
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      rawhide:
+        fast_forward_merge_into:
+          - fedora-branched
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-all

0001-DOC-Skip-examples-using-unpackaged-dependencies.patch

@@ -1,33 +0,0 @@
-From f2b1952202db32b956566648dec4cfd302f54316 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Fri, 15 Mar 2019 22:48:25 -0400
-Subject: [PATCH 1/2] DOC: Skip examples using unpackaged dependencies.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- doc/user-guide/io.rst | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/doc/user-guide/io.rst b/doc/user-guide/io.rst
-index dc495b9f..e03080a1 100644
---- a/doc/user-guide/io.rst
-+++ b/doc/user-guide/io.rst
-@@ -921,6 +921,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
- :py:meth:`DataArray.to_iris`:
- 
- .. ipython:: python
-+    :verbatim:
- 
-     da = xr.DataArray(
-         np.random.rand(4, 5),
-@@ -935,6 +936,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
- :py:meth:`DataArray.from_iris`:
- 
- .. ipython:: python
-+    :verbatim:
- 
-     da_cube = xr.DataArray.from_iris(cube)
-     da_cube
--- 
-2.39.2
-

0001-Drop-pydap-from-dependencies.patch

@@ -0,0 +1,42 @@
+From 260fec7f2a203093cb6626d464e30fab3ec70de7 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Mon, 15 Sep 2025 05:49:16 -0400
+Subject: [PATCH 1/2] Drop pydap from dependencies
+
+We didn't have it since it wasn't available in Python 3.10+, and it's
+not yet pcakaged.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ pyproject.toml                | 1 -
+ xarray/tests/test_backends.py | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 52897064..23d0b8ee 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -38,7 +38,6 @@ complete = ["xarray[accel,etc,io,parallel,viz]"]
+ io = [
+   "netCDF4>=1.6.0",
+   "h5netcdf",
+-  "pydap",
+   "scipy>=1.13",
+   "zarr>=2.18",
+   "fsspec",
+diff --git a/xarray/tests/test_backends.py b/xarray/tests/test_backends.py
+index 5aab1531..89461b0a 100644
+--- a/xarray/tests/test_backends.py
++++ b/xarray/tests/test_backends.py
+@@ -7457,7 +7457,7 @@ def test_remote_url_backend_auto_detection() -> None:
+         "https://disc2.gesdisc.eosdis.nasa.gov/dods/TRMM_3B42",  # GrADS /dods/
+     ]
+ 
+-    for url in dap_urls:
++    for url in dap_urls[:0]:
+         engine = guess_engine(url)
+         assert engine == expected_dap_backend, (
+             f"URL {url!r} should select {expected_dap_backend!r} but got {engine!r}"
+-- 
+2.52.0
+

0002-DOC-Don-t-print-out-conda-pip-environment.patch

@@ -1,39 +0,0 @@
-From f85d7fd7257f3c109987022e35f81da24a32bdbf Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 16 Mar 2019 02:59:15 -0400
-Subject: [PATCH 2/2] DOC: Don't print out conda/pip environment.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- doc/conf.py | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/doc/conf.py b/doc/conf.py
-index eb861004..faed9753 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -16,7 +16,6 @@ import datetime
- import inspect
- import os
- import pathlib
--import subprocess
- import sys
- from contextlib import suppress
- from textwrap import dedent, indent
-@@ -35,13 +34,6 @@ allowed_failures = set()
- print("python exec:", sys.executable)
- print("sys.path:", sys.path)
- 
--if "CONDA_DEFAULT_ENV" in os.environ or "conda" in sys.executable:
--    print("conda environment:")
--    subprocess.run([os.environ.get("CONDA_EXE", "conda"), "list"])
--else:
--    print("pip environment:")
--    subprocess.run([sys.executable, "-m", "pip", "list"])
--
- print(f"xarray: {xarray.__version__}, {xarray.__file__}")
- 
- with suppress(ImportError):
--- 
-2.39.2
-

0002-Ensure-netcdf4-is-locked-while-closing.patch

@@ -0,0 +1,117 @@
+From 5e5ef99ce6cae2179a2cc89b551b187fb97f35fe Mon Sep 17 00:00:00 2001
+From: David Bold <davidsch@fedoraproject.org>
+Date: Tue, 25 Nov 2025 19:58:05 -0500
+Subject: [PATCH 2/2] Ensure netcdf4 is locked while closing
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ xarray/backends/file_manager.py | 20 +++++++++++++++-----
+ xarray/backends/locks.py        |  3 +++
+ xarray/backends/netCDF4_.py     |  8 +++-----
+ 3 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/xarray/backends/file_manager.py b/xarray/backends/file_manager.py
+index f7cd4675..cf85eaf3 100644
+--- a/xarray/backends/file_manager.py
++++ b/xarray/backends/file_manager.py
+@@ -8,7 +8,7 @@ from collections.abc import Callable, Hashable, Iterator, Mapping, MutableMappin
+ from contextlib import AbstractContextManager, contextmanager
+ from typing import Any, Generic, Literal, TypeVar, cast
+ 
+-from xarray.backends.locks import acquire
++from xarray.backends.locks import NETCDF4_PYTHON_LOCK, acquire
+ from xarray.backends.lru_cache import LRUCache
+ from xarray.core import utils
+ from xarray.core.options import OPTIONS
+@@ -89,7 +89,7 @@ class CachingFileManager(FileManager[T_File]):
+         *args: Any,
+         mode: Any = _OMIT_MODE,
+         kwargs: Mapping[str, Any] | None = None,
+-        lock: Lock | None | Literal[False] = None,
++        lock: Lock | Literal[False] | None = None,
+         cache: MutableMapping[Any, T_File] | None = None,
+         manager_id: Hashable | None = None,
+         ref_counts: dict[Any, int] | None = None,
+@@ -448,9 +448,16 @@ def _remove_del_methods():
+ class DummyFileManager(FileManager[T_File]):
+     """FileManager that simply wraps an open file in the FileManager interface."""
+ 
+-    def __init__(self, value: T_File, *, close: Callable[[], None] | None = None):
++    def __init__(
++        self,
++        value: T_File,
++        *,
++        close: Callable[[], None] | None = None,
++        lock: Lock | Literal[False] | None = None,
++    ):
+         if close is None:
+             close = value.close
++        self._lock = lock
+         self._value = value
+         self._close = close
+ 
+@@ -464,5 +471,8 @@ class DummyFileManager(FileManager[T_File]):
+         yield self._value
+ 
+     def close(self, needs_lock: bool = True) -> None:
+-        del needs_lock  # unused
+-        self._close()
++        if needs_lock and self._lock:
++            with self._lock:
++                self._close()
++        else:
++            self._close()
+diff --git a/xarray/backends/locks.py b/xarray/backends/locks.py
+index 78444354..e2db5e93 100644
+--- a/xarray/backends/locks.py
++++ b/xarray/backends/locks.py
+@@ -281,3 +281,6 @@ def ensure_lock(lock: Lock | None | Literal[False]) -> Lock:
+     if lock is None or lock is False:
+         return DummyLock()
+     return lock
++
++
++NETCDF4_PYTHON_LOCK = combine_locks([NETCDFC_LOCK, HDF5_LOCK])
+diff --git a/xarray/backends/netCDF4_.py b/xarray/backends/netCDF4_.py
+index bb511f9b..5d5d4e74 100644
+--- a/xarray/backends/netCDF4_.py
++++ b/xarray/backends/netCDF4_.py
+@@ -30,7 +30,7 @@ from xarray.backends.file_manager import (
+     PickleableFileManager,
+ )
+ from xarray.backends.locks import (
+-    HDF5_LOCK,
++    NETCDF4_PYTHON_LOCK,
+     NETCDFC_LOCK,
+     combine_locks,
+     ensure_lock,
+@@ -67,8 +67,6 @@ if TYPE_CHECKING:
+ # string used by netCDF4.
+ _endian_lookup = {"=": "native", ">": "big", "<": "little", "|": "native"}
+ 
+-NETCDF4_PYTHON_LOCK = combine_locks([NETCDFC_LOCK, HDF5_LOCK])
+-
+ 
+ class BaseNetCDF4Array(BackendArray):
+     __slots__ = ("datastore", "dtype", "shape", "variable_name")
+@@ -421,7 +419,7 @@ class NetCDF4DataStore(WritableCFDataStore):
+                         "argument is provided"
+                     )
+                 root = manager
+-            manager = DummyFileManager(root)
++            manager = DummyFileManager(root, lock=NETCDF4_PYTHON_LOCK)
+ 
+         self._manager = manager
+         self._group = group
+@@ -520,7 +518,7 @@ class NetCDF4DataStore(WritableCFDataStore):
+             )
+         else:
+             manager = CachingFileManager(
+-                netCDF4.Dataset, filename, mode=mode, kwargs=kwargs
++                netCDF4.Dataset, filename, lock=lock, mode=mode, kwargs=kwargs
+             )
+         return cls(manager, group=group, mode=mode, lock=lock, autoclose=autoclose)
+ 
+-- 
+2.52.0
+

8186.patch

@@ -1,29 +0,0 @@
-From c7391fca66e1fd24b175cfffab692af20628fe2b Mon Sep 17 00:00:00 2001
-From: Kyle Sunden <git@ksunden.space>
-Date: Thu, 14 Sep 2023 20:18:04 -0500
-Subject: [PATCH] Update contourf call check for mpl 3.8
-
----
- xarray/tests/test_plot.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/xarray/tests/test_plot.py b/xarray/tests/test_plot.py
-index 8b2dfbdec4..a6c15a8600 100644
---- a/xarray/tests/test_plot.py
-+++ b/xarray/tests/test_plot.py
-@@ -167,7 +167,14 @@ def imshow_called(self, plotmethod):
- 
-     def contourf_called(self, plotmethod):
-         plotmethod()
--        paths = plt.gca().findobj(mpl.collections.PathCollection)
-+
-+        # Compatible with mpl before (PathCollection) and after (QuadContourSet) 3.8
-+        def matchfunc(x):
-+            return isinstance(
-+                x, (mpl.collections.PathCollection, mpl.contour.QuadContourSet)
-+            )
-+
-+        paths = plt.gca().findobj(matchfunc)
-         return len(paths) > 0
- 
- 

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.12.0.post1.dev20+g7d30dac21.

python-xarray.spec

@@ -1,38 +1,32 @@
 %global srcname xarray
-%global data_commit 7d8290e0be9d2a8f4b4381641f20a97db6eaea3d
-
-%bcond_with docs
 
 Name:           python-%{srcname}
-Version:        2023.8.0
+Version:        2025.12.0
 Release:        %autorelease
 Summary:        N-D labeled arrays and datasets in Python
 
 License:        Apache-2.0
 URL:            https://github.com/pydata/xarray
-Source0:        %pypi_source %{srcname}
-# Data for examples only.
-Source1:        https://github.com/pydata/xarray-data/archive/%{data_commit}/xarray-data-%{data_commit}.tar.gz
-# All Fedora specific.
-Patch0001:      0001-DOC-Skip-examples-using-unpackaged-dependencies.patch
-Patch0002:      0002-DOC-Don-t-print-out-conda-pip-environment.patch
-# Fix tests with Matplotlib 3.8.0.
-Patch0003:      https://github.com/pydata/xarray/pull/8186.patch
+Source:         %pypi_source %{srcname}
+# Fedora specific.
+Patch:          0001-Drop-pydap-from-dependencies.patch
+# RHBZ#2395128
+# https://github.com/pydata/xarray/pull/10788
+Patch:          0002-Ensure-netcdf4-is-locked-while-closing.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(bottleneck)
-BuildRequires:  python3dist(cftime) >= 1.2
-BuildRequires:  python3dist(dask[array]) >= 2.30
-BuildRequires:  python3dist(dask[dataframe]) >= 2.30
-BuildRequires:  python3dist(netcdf4) >= 1.5
-BuildRequires:  python3dist(pint) >= 0.16
+BuildRequires:  python3dist(dask[array]) >= 2023.11
+BuildRequires:  python3dist(dask[dataframe]) >= 2023.11
+BuildRequires:  python3dist(pint) >= 0.22
 BuildRequires:  python3dist(pytest) >= 2.7.1
+BuildRequires:  python3dist(pytest-asyncio)
 BuildRequires:  python3dist(pytest-xdist)
-BuildRequires:  python3dist(rasterio) >= 1.1
-BuildRequires:  python3dist(seaborn) >= 0.11
-BuildRequires:  python3dist(zarr) >= 2.5
+BuildRequires:  python3dist(pytest-timeout)
+BuildRequires:  python3dist(rasterio) >= 1.3
+BuildRequires:  python3dist(seaborn) >= 0.13
 
 %global _description %{expand: \
 Xarray (formerly xray) is an open source project and Python package that
@@ -52,86 +46,42 @@ data model, and integrates tightly with dask for parallel computing.}
 
 %description %{_description}
 
-
 %package -n     python3-%{srcname}
 Summary:        %{summary}
-
 %description -n python3-%{srcname} %{_description}
 
-
-%if %{with docs}
-%package -n python-%{srcname}-doc
-Summary:        xarray documentation
-
-BuildRequires:  python3dist(cartopy)
-BuildRequires:  natural-earth-map-data-110m
-BuildRequires:  natural-earth-map-data-10m
-BuildRequires:  python3-ipython-sphinx
-BuildRequires:  python3dist(jupyter-client)
-BuildRequires:  python3dist(matplotlib) >= 3.3
-BuildRequires:  python3dist(sphinx)
-BuildRequires:  python3dist(sphinx-gallery)
-BuildRequires:  python3dist(sphinx-rtd-theme)
-
-%description -n python-%{srcname}-doc
-Documentation for xarray
-%endif
-
+%pyproject_extras_subpkg -n python3-%{srcname} io
 
 %prep
 %autosetup -n %{srcname}-%{version} -p1
 
-%if %{with docs}
-# Provide example datasets for building docs.
-tar xf %SOURCE1 --transform='s~^\(%{srcname}-data-%{data_commit}/\)~\1.xarray_tutorial_data/~'
-%endif
-
-
 %generate_buildrequires
-%pyproject_buildrequires -r
-
+%pyproject_buildrequires -x io
 
 %build
 %pyproject_wheel
 
-%if %{with docs}
-# generate html docs
-pushd doc
-PYTHONPATH=${PWD}/.. HOME=${PWD}/../%{srcname}-data-%{data_commit} make html
-# remove the sphinx-build leftovers
-rm -rf _build/html/.{doctrees,buildinfo}
-popd
-%endif
-
-
 %install
 %pyproject_install
-%pyproject_save_files %{srcname}
-
+%pyproject_save_files -l %{srcname}
 
 %check
 rm -rf xarray
 
+echo >> pytest.ini  # Ignore any command-line arguments from upstream.
+
 pytest_args=(
   -n auto
   -m "not network"
-  # https://github.com/pydata/xarray/issues/7513
-  -k 'not test_open_mfdataset_manyfiles'
+  # this test somehow crashes python interpreter entirely, was xfail upstream till recently
+  -k 'not test_save_mfdataset_compute_false_roundtrip'
 )
 
-%{pytest} -ra "${pytest_args[@]}" --pyargs xarray
-
+%{pytest} -ra "${pytest_args[@]}" --pyargs xarray --timeout 300 --full-trace
 
 %files -n python3-%{srcname} -f %{pyproject_files}
-%license LICENSE licenses/DASK_LICENSE licenses/NUMPY_LICENSE licenses/PANDAS_LICENSE licenses/PYTHON_LICENSE licenses/SEABORN_LICENSE
+%license licenses/*
 %doc README.md
 
-%if %{with docs}
-%files -n python-%{srcname}-doc
-%doc doc/_build/html
-%license LICENSE licenses/DASK_LICENSE licenses/NUMPY_LICENSE licenses/PANDAS_LICENSE licenses/PYTHON_LICENSE licenses/SEABORN_LICENSE
-%endif
-
-
 %changelog
 %autochangelog

sources

@@ -1,2 +1 @@
-SHA512 (xarray-2023.8.0.tar.gz) = 1d712e9fbf266906ac35c199eead77cec76ba5b4b4462140bef2fffd227a52d2cba9670a042cb669b0567320e9308bf81fe4e84c1cfcff234ad2332d72e895a3
-SHA512 (xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz) = 3734ad5649b9ba23e8fe52ac1fc34694dcb3c761a1817e520726a83d31e725e2448aa0109ad7ad385572ae7d6a285bf1407d104f87227127a6a51d73b797a952
+SHA512 (xarray-2025.12.0.tar.gz) = 7bbdf756d24a91c4a11c5d38d10dfe520e2cb80ba2beecdbf534fae76c6c6148232f2f072d068daab60146d46c89e12800276ebc1bc4d5228b16dde8f80d9793