From 751e38064fad7d098b60d0851727fc12f5faec3d Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 5 Dec 2025 23:50:27 +0000 Subject: [PATCH] Update to 2025.12.0 upstream release - Resolves: rhbz#2419634 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + 0001-Drop-pydap-from-dependencies.patch | 12 ++++++------ 0002-Ensure-netcdf4-is-locked-while-closing.patch | 6 +++--- README.packit | 2 +- python-xarray.spec | 2 +- sources | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 9f5edfd..fcd7b38 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /xarray-2025.4.0.tar.gz /xarray-2025.9.0.tar.gz /xarray-2025.11.0.tar.gz +/xarray-2025.12.0.tar.gz diff --git a/0001-Drop-pydap-from-dependencies.patch b/0001-Drop-pydap-from-dependencies.patch index 07171e3..5e9eb4b 100644 --- a/0001-Drop-pydap-from-dependencies.patch +++ b/0001-Drop-pydap-from-dependencies.patch @@ -1,4 +1,4 @@ -From afa4a2a75f431fd8eb6f46552b6731a6343301e2 Mon Sep 17 00:00:00 2001 +From 260fec7f2a203093cb6626d464e30fab3ec70de7 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 15 Sep 2025 05:49:16 -0400 Subject: [PATCH 1/2] Drop pydap from dependencies @@ -13,7 +13,7 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 31886b8c..fa286383 100644 +index 52897064..23d0b8ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,6 @@ complete = ["xarray[accel,etc,io,parallel,viz]"] @@ -25,11 +25,11 @@ index 31886b8c..fa286383 100644 "zarr>=2.18", "fsspec", diff --git a/xarray/tests/test_backends.py b/xarray/tests/test_backends.py -index 36a1e354..946847d6 100644 +index 5aab1531..89461b0a 100644 --- a/xarray/tests/test_backends.py +++ b/xarray/tests/test_backends.py -@@ -7411,7 +7411,7 @@ def test_remote_url_backend_auto_detection() -> None: - "https://example.com/services/DAP2/dataset", # uppercase in path +@@ -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: @@ -38,5 +38,5 @@ index 36a1e354..946847d6 100644 assert engine == expected_dap_backend, ( f"URL {url!r} should select {expected_dap_backend!r} but got {engine!r}" -- -2.50.0 +2.52.0 diff --git a/0002-Ensure-netcdf4-is-locked-while-closing.patch b/0002-Ensure-netcdf4-is-locked-while-closing.patch index 9932ec6..726fd02 100644 --- a/0002-Ensure-netcdf4-is-locked-while-closing.patch +++ b/0002-Ensure-netcdf4-is-locked-while-closing.patch @@ -1,4 +1,4 @@ -From a7f162c1cbb088f9b863e5e32408f07376442641 Mon Sep 17 00:00:00 2001 +From 5e5ef99ce6cae2179a2cc89b551b187fb97f35fe Mon Sep 17 00:00:00 2001 From: David Bold Date: Tue, 25 Nov 2025 19:58:05 -0500 Subject: [PATCH 2/2] Ensure netcdf4 is locked while closing @@ -73,7 +73,7 @@ index 78444354..e2db5e93 100644 + +NETCDF4_PYTHON_LOCK = combine_locks([NETCDFC_LOCK, HDF5_LOCK]) diff --git a/xarray/backends/netCDF4_.py b/xarray/backends/netCDF4_.py -index 2c686951..5bc7a741 100644 +index bb511f9b..5d5d4e74 100644 --- a/xarray/backends/netCDF4_.py +++ b/xarray/backends/netCDF4_.py @@ -30,7 +30,7 @@ from xarray.backends.file_manager import ( @@ -113,5 +113,5 @@ index 2c686951..5bc7a741 100644 return cls(manager, group=group, mode=mode, lock=lock, autoclose=autoclose) -- -2.50.0 +2.52.0 diff --git a/README.packit b/README.packit index a901bca..b4b46e3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. +The file was generated using packit 1.12.0.post1.dev20+g7d30dac21. diff --git a/python-xarray.spec b/python-xarray.spec index b37d30b..a63efb3 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -1,7 +1,7 @@ %global srcname xarray Name: python-%{srcname} -Version: 2025.11.0 +Version: 2025.12.0 Release: %autorelease Summary: N-D labeled arrays and datasets in Python diff --git a/sources b/sources index 9b216e1..a7b0439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xarray-2025.11.0.tar.gz) = 8dc1a7dc058d945c19c829f95f1ea132fe4f52471659428d0a4e109f54dbae9c4da10647303b6870548f0b0013469936265206638559096bcc6fe73a0f1f7c1c +SHA512 (xarray-2025.12.0.tar.gz) = 7bbdf756d24a91c4a11c5d38d10dfe520e2cb80ba2beecdbf534fae76c6c6148232f2f072d068daab60146d46c89e12800276ebc1bc4d5228b16dde8f80d9793