diff --git a/.gitignore b/.gitignore index e3c94b2..1e074a6 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /xarray-2024.10.0.tar.gz /xarray-2025.1.1.tar.gz /xarray-2025.4.0.tar.gz +/xarray-2025.9.0.tar.gz diff --git a/0001-Avoid-unsafe-casts-from-float-to-unsigned-int.patch b/0001-Avoid-unsafe-casts-from-float-to-unsigned-int.patch deleted file mode 100644 index 993c3b0..0000000 --- a/0001-Avoid-unsafe-casts-from-float-to-unsigned-int.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7dcc6fb328ff5ca0695a019d00da5714911ab766 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sun, 19 Jan 2025 04:47:23 -0500 -Subject: [PATCH] Avoid unsafe casts from float to unsigned int - -Fixes #9815 - -Signed-off-by: Elliott Sales de Andrade ---- - xarray/coding/variables.py | 5 ++++- - xarray/core/duck_array_ops.py | 10 ++++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/xarray/coding/variables.py b/xarray/coding/variables.py -index 1b7bc95e..814406a2 100644 ---- a/xarray/coding/variables.py -+++ b/xarray/coding/variables.py -@@ -345,7 +345,10 @@ class CFMaskCoder(VariableCoder): - if fill_value is not None and has_unsigned: - pop_to(encoding, attrs, "_Unsigned") - # XXX: Is this actually needed? Doesn't the backend handle this? -- data = duck_array_ops.astype(duck_array_ops.around(data), dtype) -+ signed_dtype = np.dtype(f"i{dtype.itemsize}") -+ data = duck_array_ops.view( -+ duck_array_ops.astype(duck_array_ops.around(data), signed_dtype), dtype -+ ) - attrs["_FillValue"] = fill_value - - return Variable(dims, data, attrs, encoding, fastpath=True) -diff --git a/xarray/core/duck_array_ops.py b/xarray/core/duck_array_ops.py -index 96330a64..268dbe4d 100644 ---- a/xarray/core/duck_array_ops.py -+++ b/xarray/core/duck_array_ops.py -@@ -238,6 +238,16 @@ def astype(data, dtype, *, xp=None, **kwargs): - return xp.astype(data, dtype, **kwargs) - - -+def view(data, *args, **kwargs): -+ if hasattr(data, "__array_namespace__"): -+ xp = get_array_namespace(data) -+ if xp == np: -+ # numpy currently doesn't have a view: -+ return data.view(*args, **kwargs) -+ return xp.view(data, *args, **kwargs) -+ return data.view(*args, **kwargs) -+ -+ - def asarray(data, xp=np, dtype=None): - converted = data if is_duck_array(data) else xp.asarray(data) - --- -2.49.0 - diff --git a/0001-Drop-pydap-from-dependencies.patch b/0001-Drop-pydap-from-dependencies.patch new file mode 100644 index 0000000..300542c --- /dev/null +++ b/0001-Drop-pydap-from-dependencies.patch @@ -0,0 +1,28 @@ +From 9b688c92bac2f5f0b91371af59f0d9ede076217c Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Mon, 15 Sep 2025 05:49:16 -0400 +Subject: [PATCH] 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 +--- + pyproject.toml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 9da83f80..98c3e13d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -39,7 +39,6 @@ complete = ["xarray[accel,etc,io,parallel,viz]"] + io = [ + "netCDF4>=1.6.0", + "h5netcdf", +- "pydap", + "scipy>=1.13", + "zarr>=2.18", + "fsspec", +-- +2.50.0 + diff --git a/README.packit b/README.packit index 807ffc6..fb341a1 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.6.0.post1.dev2+gd5a7662a. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/python-xarray.spec b/python-xarray.spec index 16404cd..1d0dbe8 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -1,16 +1,15 @@ %global srcname xarray Name: python-%{srcname} -Version: 2025.4.0 +Version: 2025.9.0 Release: %autorelease Summary: N-D labeled arrays and datasets in Python License: Apache-2.0 URL: https://github.com/pydata/xarray Source: %pypi_source %{srcname} - -# https://github.com/pydata/xarray/pull/9964 -Patch: 0001-Avoid-unsafe-casts-from-float-to-unsigned-int.patch +# Fedora specific. +Patch: 0001-Drop-pydap-from-dependencies.patch BuildArch: noarch diff --git a/sources b/sources index e0b352e..7222736 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xarray-2025.4.0.tar.gz) = 8018bf2431f30194d057e363f8a72fb7ef99834ae14daec5b98e5e101b42c7b1199d583eb9621c9955830bb15b3c197b08e71c6a299abeb42a6a215a57ea5995 +SHA512 (xarray-2025.9.0.tar.gz) = 0cc572de58c59badb383d20292cf092500192e1723c12423f7d4c87e110feb08156cff71c136e45dd35eb70941a55e44a88774b698d09ecd083a882a207317e1