52 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY
b1aece274c epel10 2025-05-21 10:19:56 -04:00
Elliott Sales de Andrade
6e553d61be Fix additional architecture-specific bugs 2025-01-19 06:08:30 -05:00
Fedora Release Engineering
ffa3ac90cb Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 20:49:57 +00:00
Elliott Sales de Andrade
68a87599ce Update to latest version (#2328431)
- Remove doc subpackage; it's been disabled for a while
2025-01-13 22:32:01 -05:00
Elliott Sales de Andrade
c40c2b8108 Add Packit configuration 2025-01-13 22:31:41 -05:00
Elliott Sales de Andrade
7aca2e8d68 Update to latest version (#2245099) 2024-11-11 07:09:04 -05:00
Elliott Sales de Andrade
b4a8abb2fc Fix tests on big-endian systems
Also, remove a redundant skip, as the listed test is skipped by upstream
already.
2024-08-19 01:35:57 -04:00
Elliott Sales de Andrade
4a8ca0c05d Update to latest version (#2245099) 2024-08-18 23:42:52 -04:00
Fedora Release Engineering
28752f8893 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 17:09:28 +00:00
Adam Williamson
f24a6d1c9b Update to latest upstream release, disable a failing test 2024-06-18 01:15:38 -07:00
Gwyn Ciesla
362dcc1ead Python 3.13 rebuild 2024-06-13 08:42:23 -05:00
Fedora Release Engineering
0d92610f0c Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 13:04:16 +00:00
Fedora Release Engineering
e61d64d3e4 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 09:05:39 +00:00
Elliott Sales de Andrade
e75d5c9d07 Update to latest version (#2240764) 2023-09-27 04:11:28 -04:00
Elliott Sales de Andrade
3bebaa049c Update to latest version (#2232901) 2023-09-15 02:37:47 -04:00
Elliott Sales de Andrade
ad60aec436 Fix tests with Matplotlib 3.8.0 2023-09-15 02:03:11 -04:00
Elliott Sales de Andrade
dd372c6ddb Update to latest version (#2208416) 2023-07-19 22:05:07 -04:00
Elliott Sales de Andrade
f0dca5ea32 Rebuild for Python 3.12b4 2023-07-19 06:02:04 -04:00
Elliott Sales de Andrade
8294269fad Skip flaky test 2023-05-08 04:49:44 -04:00
Elliott Sales de Andrade
ea961bf619 Update to latest version (#2131120) 2023-05-08 03:02:23 -04:00
Elliott Sales de Andrade
099f6f89e8 Fix sources
[skip changelog]
2023-01-18 20:35:50 -05:00
Elliott Sales de Andrade
72b1741aac Update to latest version (#2131120) 2023-01-18 19:50:22 -05:00
Elliott Sales de Andrade
1106cd741b Update to latest version (#2095334) 2022-08-01 02:29:35 -04:00
Fedora Release Engineering
2fd902e2ef Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 23:31:22 +00:00
Python Maint
7be656d7e6 Rebuilt for Python 3.11 2022-06-21 16:26:48 +02:00
Elliott Sales de Andrade
10e862c9fd Update to latest version (#2060096) 2022-03-05 19:11:45 -05:00
Elliott Sales de Andrade
48efc18b8d Update to latest version (#2047970) 2022-02-13 02:14:53 -05:00
Elliott Sales de Andrade
d99c648e41 Update to latest version (#2047970) 2022-01-29 03:29:25 -05:00
Fedora Release Engineering
0d1637a5c2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 16:34:05 +00:00
Elliott Sales de Andrade
3415293533 Fix missing sources 2021-12-19 20:44:36 -05:00
Elliott Sales de Andrade
ceb9cc2296 Update to latest version (#2030938) 2021-12-19 20:15:38 -05:00
Elliott Sales de Andrade
9ed2fe88a3 Update to latest version (#2019529) 2021-11-28 01:05:24 -05:00
Elliott Sales de Andrade
9fb0fe6531 Switch to latest Python macros 2021-11-28 01:02:49 -05:00
Elliott Sales de Andrade
083a1048eb Remove old patches. 2021-08-20 18:16:37 -04:00
Elliott Sales de Andrade
00fc971647 Fix sources file. 2021-08-20 16:31:19 -04:00
Elliott Sales de Andrade
209398495a Update to latest version (#1985557) 2021-08-20 16:04:20 -04:00
Elliott Sales de Andrade
7b07a86ee0 Convert to rpmautospec. 2021-08-20 05:46:21 -04:00
Fedora Release Engineering
679ba1684e - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-27 08:38:51 +00:00
Elliott Sales de Andrade
f252ef5e5b Backport fixes to tests. 2021-07-04 17:38:28 -04:00
Zbigniew Jędrzejewski-Szmek
e4e358fa82 Add forgotten changelog entry
Sorry for the mess!
2021-06-17 14:55:47 +02:00
Zbigniew Jędrzejewski-Szmek
4a68bbd5b8 Restore auxiliary sources 2021-06-17 14:44:50 +02:00
Zbigniew Jędrzejewski-Szmek
5548983db1 Version 0.18.2, skip failing tests 2021-06-17 14:41:17 +02:00
Python Maint
c27bff9578 Rebuilt for Python 3.10 2021-06-04 21:09:47 +02:00
Elliott Sales de Andrade
92642a4ace Update to latest version. 2021-03-13 06:01:29 -05:00
Fedora Release Engineering
a0d4600a4a - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 14:15:31 +00:00
Elliott Sales de Andrade
924dddb55e Update to latest version. 2020-12-12 19:03:21 -05:00
Elliott Sales de Andrade
facfa49251 Update to latest version. 2020-09-26 23:53:57 -04:00
Fedora Release Engineering
0dd10a097c - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 04:42:00 +00:00
Elliott Sales de Andrade
01acc30df2 Update to latest version. 2020-07-12 20:46:32 -04:00
Elliott Sales de Andrade
64c9d5b495 Backport fix for alternate architectures. 2020-06-24 15:44:18 -04:00
Elliott Sales de Andrade
92222176fe Backport patch to fix tests catching too many warnings. 2020-06-23 04:32:16 -04:00
Miro Hrončok
e8852ff34b Rebuilt for Python 3.9 2020-05-26 03:46:31 +02:00
13 changed files with 372 additions and 300 deletions

25
.gitignore vendored
View File

@@ -4,3 +4,28 @@
/xarray-0.12.3.tar.gz
/xarray-0.15.0.tar.gz
/xarray-0.15.1.tar.gz
/xarray-0.16.0.tar.gz
/xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz
/xarray-0.16.1.tar.gz
/xarray-0.16.2.tar.gz
/xarray-0.17.0.tar.gz
/xarray-0.18.2.tar.gz
/xarray-0.19.0.tar.gz
/xarray-0.20.1.tar.gz
/xarray-0.20.2.tar.gz
/xarray-0.21.0.tar.gz
/xarray-0.21.1.tar.gz
/xarray-2022.3.0.tar.gz
/xarray-data-dbd07bb91a7112db0fd2f912c146999f9d436b0e.tar.gz
/xarray-2022.6.0.tar.gz
/xarray-data-86974d54ce83a130303fe8caa629e60deb3cb6e5.tar.gz
/xarray-2023.1.0.tar.gz
/xarray-2023.4.2.tar.gz
/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

18
.packit.yaml Normal file
View File

@@ -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

View File

@@ -1,40 +0,0 @@
From 75584dd2b3d7c7411220bb21ee751002d51498c7 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 15 Mar 2019 22:31:18 -0400
Subject: [PATCH 1/4] DOC: Don't download RGB.byte.tif during build.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
doc/gallery/plot_rasterio.py | 2 +-
doc/gallery/plot_rasterio_rgb.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/gallery/plot_rasterio.py b/doc/gallery/plot_rasterio.py
index 99eb1fd1..3d797296 100644
--- a/doc/gallery/plot_rasterio.py
+++ b/doc/gallery/plot_rasterio.py
@@ -23,7 +23,7 @@ from rasterio.warp import transform
import xarray as xr
# Read the data
-url = "https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif"
+url = "RGB.byte.tif"
da = xr.open_rasterio(url)
# Compute the lon/lat coordinates with rasterio.warp.transform
diff --git a/doc/gallery/plot_rasterio_rgb.py b/doc/gallery/plot_rasterio_rgb.py
index 758d4cd3..f2a7b2db 100644
--- a/doc/gallery/plot_rasterio_rgb.py
+++ b/doc/gallery/plot_rasterio_rgb.py
@@ -18,7 +18,7 @@ import matplotlib.pyplot as plt
import xarray as xr
# Read the data
-url = "https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif"
+url = "RGB.byte.tif"
da = xr.open_rasterio(url)
# The data is in UTM projection. We have to set it manually until
--
2.21.1

View File

@@ -0,0 +1,34 @@
From f41100ae4202dce5891854143ba3a31f4e2d5a6d Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 14 Jan 2025 02:46:39 -0500
Subject: [PATCH 1/2] Fix test_doc_example on big-endian systems
... by using a fixed-endian input.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
xarray/tests/test_datatree.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/xarray/tests/test_datatree.py b/xarray/tests/test_datatree.py
index 7b295128..21870050 100644
--- a/xarray/tests/test_datatree.py
+++ b/xarray/tests/test_datatree.py
@@ -1240,8 +1240,12 @@ class TestRepr:
)
def test_doc_example(self) -> None:
# regression test for https://github.com/pydata/xarray/issues/9499
- time = xr.DataArray(data=["2022-01", "2023-01"], dims="time")
- stations = xr.DataArray(data=list("abcdef"), dims="station")
+ time = xr.DataArray(
+ data=np.array(["2022-01", "2023-01"], dtype="<U7"), dims="time"
+ )
+ stations = xr.DataArray(
+ data=np.array(list("abcdef"), dtype="<U1"), dims="station"
+ )
lon = [-100, -80, -60]
lat = [10, 20, 30]
# Set up fake data
--
2.47.0

View File

@@ -0,0 +1,53 @@
From e84321150e52a19e617efd7f8798d6859bd3c5e7 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 19 Jan 2025 04:47:23 -0500
Subject: [PATCH 2/2] Avoid unsafe casts from float to unsigned int
Fixes #9815
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
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 8154f044..355f3b0b 100644
--- a/xarray/coding/variables.py
+++ b/xarray/coding/variables.py
@@ -426,7 +426,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 7e7333fd..be842b66 100644
--- a/xarray/core/duck_array_ops.py
+++ b/xarray/core/duck_array_ops.py
@@ -236,6 +236,16 @@ def astype(data, dtype, **kwargs):
return data.astype(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.47.0

View File

@@ -1,33 +0,0 @@
From bc95d0d73a1ab2f25ce7074bf0de803892eced54 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 2/4] DOC: Skip examples using unpackaged dependencies.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
doc/io.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/doc/io.rst b/doc/io.rst
index e9109432..3e95540c 100644
--- a/doc/io.rst
+++ b/doc/io.rst
@@ -498,6 +498,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), dims=['x', 'y'],
coords=dict(x=[10, 20, 30, 40],
@@ -510,6 +511,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.21.1

View File

@@ -1,31 +0,0 @@
From aebdf7c14a3a7df2ab45467074b4dd6dacc8d682 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 3/4] DOC: Don't print out conda/pip environment.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
doc/conf.py | 7 -------
1 file changed, 7 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index 578f9cf5..a23031a0 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -32,13 +32,6 @@ allowed_failures = set()
print("python exec:", sys.executable)
print("sys.path:", sys.path)
-if "conda" in sys.executable:
- print("conda environment:")
- subprocess.run(["conda", "list"])
-else:
- print("pip environment:")
- subprocess.run(["pip", "list"])
-
print("xarray: %s, %s" % (xarray.__version__, xarray.__file__))
with suppress(ImportError):
--
2.21.1

36
0003-tests-epel10.patch Normal file
View File

@@ -0,0 +1,36 @@
--- xarray-2025.1.1/xarray/tests/test_dask.py.orig 2025-05-21 09:34:50.648289221 -0400
+++ xarray-2025.1.1/xarray/tests/test_dask.py 2025-05-21 09:37:04.903633951 -0400
@@ -1042,6 +1042,8 @@
ds.foo.variable.compute()
+@pytest.mark.flaky
+@pytest.mark.skip(reason="maybe flaky epel10")
def test_dask_layers_and_dependencies():
ds = Dataset({"foo": ("x", range(5)), "bar": ("x", range(5))}).chunk()
--- xarray-2025.1.1/xarray/tests/test_datatree_mapping.py.orig 2025-05-21 09:37:35.179529595 -0400
+++ xarray-2025.1.1/xarray/tests/test_datatree_mapping.py 2025-05-21 09:38:39.269279900 -0400
@@ -157,6 +157,8 @@
result = dt.map_over_datasets(empty_func)
assert result["set1/set2"].attrs == dt["set1/set2"].attrs
+ @pytest.mark.flaky
+ @pytest.mark.skip(reason="maybe flaky epel10")
def test_error_contains_path_of_offending_node(self, create_test_datatree):
dt = create_test_datatree()
dt["set1"]["bad_var"] = 0
--- xarray-2025.1.1/xarray/tests/test_backends.py.orig 2025-05-21 10:05:24.190411283 -0400
+++ xarray-2025.1.1/xarray/tests/test_backends.py 2025-05-21 10:07:26.667130437 -0400
@@ -5677,9 +5677,8 @@
@requires_scipy_or_netCDF4
@pytest.mark.parametrize("calendar", _STANDARD_CALENDARS)
-@pytest.mark.xfail(
- has_numpy_2, reason="https://github.com/pandas-dev/pandas/issues/56996"
-)
+@pytest.mark.flaky
+@pytest.mark.skip(reason="maybe flaky epel10")
def test_use_cftime_false_standard_calendar_in_range(calendar) -> None:
x = [0, 1]
time = [0, 720]

View File

@@ -1,78 +0,0 @@
From 7c9e266e5a2460391700a54da1c14e35205536a6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 31 Aug 2019 04:24:59 -0400
Subject: [PATCH 4/4] Use drawstyle instead of linestyle in plot.step.
Mixing the two is deprecated in Matplotlib 3.1, and breaks the doc build
if warnings are set to errors (which they are in new IPython sphinx
extensions.)
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
xarray/plot/plot.py | 18 +++++++++---------
xarray/plot/utils.py | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xarray/plot/plot.py b/xarray/plot/plot.py
index 98131887..302cac05 100644
--- a/xarray/plot/plot.py
+++ b/xarray/plot/plot.py
@@ -329,7 +329,7 @@ def line(
return primitive
-def step(darray, *args, where="pre", linestyle=None, ls=None, **kwargs):
+def step(darray, *args, where="pre", drawstyle=None, ds=None, **kwargs):
"""
Step plot of DataArray index against values
@@ -359,16 +359,16 @@ def step(darray, *args, where="pre", linestyle=None, ls=None, **kwargs):
if where not in {"pre", "post", "mid"}:
raise ValueError("'where' argument to step must be " "'pre', 'post' or 'mid'")
- if ls is not None:
- if linestyle is None:
- linestyle = ls
+ if ds is not None:
+ if drawstyle is None:
+ drawstyle = ds
else:
- raise TypeError("ls and linestyle are mutually exclusive")
- if linestyle is None:
- linestyle = ""
- linestyle = "steps-" + where + linestyle
+ raise TypeError("ds and drawstyle are mutually exclusive")
+ if drawstyle is None:
+ drawstyle = ""
+ drawstyle = "steps-" + where + drawstyle
- return line(darray, *args, linestyle=linestyle, **kwargs)
+ return line(darray, *args, drawstyle=drawstyle, **kwargs)
def hist(
diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
index 6eec7c6b..08991e08 100644
--- a/xarray/plot/utils.py
+++ b/xarray/plot/utils.py
@@ -461,7 +461,7 @@ def _resolve_intervals_1dplot(xval, yval, xlabel, ylabel, kwargs):
"""
# Is it a step plot? (see matplotlib.Axes.step)
- if kwargs.get("linestyle", "").startswith("steps-"):
+ if kwargs.get("drawstyle", "").startswith("steps-"):
# Convert intervals to double points
if _valid_other_type(np.array([xval, yval]), [pd.Interval]):
@@ -472,7 +472,7 @@ def _resolve_intervals_1dplot(xval, yval, xlabel, ylabel, kwargs):
yval, xval = _interval_to_double_bound_points(yval, xval)
# Remove steps-* to be sure that matplotlib is not confused
- del kwargs["linestyle"]
+ del kwargs["drawstyle"]
# Is it another kind of plot?
else:
--
2.21.1

102
9945.patch Normal file
View File

@@ -0,0 +1,102 @@
From da4aa1f2f116089c75adee5954bcc9ab755bcb89 Mon Sep 17 00:00:00 2001
From: Deepak Cherian <deepak@cherian.net>
Date: Mon, 13 Jan 2025 08:00:50 -0600
Subject: [PATCH 1/2] Remove outdated quantile test.
dask now auto-rechunks for quantile.
Closes #9860
---
xarray/tests/test_groupby.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/xarray/tests/test_groupby.py b/xarray/tests/test_groupby.py
index e4383dd58a9..2349ff0adfd 100644
--- a/xarray/tests/test_groupby.py
+++ b/xarray/tests/test_groupby.py
@@ -284,7 +284,6 @@ def test_da_groupby_empty() -> None:
@requires_dask
def test_dask_da_groupby_quantile() -> None:
- # Only works when the grouped reduction can run blockwise
# Scalar quantile
expected = xr.DataArray(
data=[2, 5], coords={"x": [1, 2], "quantile": 0.5}, dims="x"
@@ -292,8 +291,6 @@ def test_dask_da_groupby_quantile() -> None:
array = xr.DataArray(
data=[1, 2, 3, 4, 5, 6], coords={"x": [1, 1, 1, 2, 2, 2]}, dims="x"
)
- with pytest.raises(ValueError):
- array.chunk(x=1).groupby("x").quantile(0.5)
# will work blockwise with flox
actual = array.chunk(x=3).groupby("x").quantile(0.5)
@@ -327,7 +324,8 @@ def test_dask_da_groupby_median() -> None:
assert_identical(expected, actual)
-def test_da_groupby_quantile() -> None:
+@pytest.mark.parametrize("use_flox", [True, False])
+def test_da_groupby_quantile(use_flox) -> None:
array = xr.DataArray(
data=[1, 2, 3, 4, 5, 6], coords={"x": [1, 1, 1, 2, 2, 2]}, dims="x"
)
@@ -336,8 +334,10 @@ def test_da_groupby_quantile() -> None:
expected = xr.DataArray(
data=[2, 5], coords={"x": [1, 2], "quantile": 0.5}, dims="x"
)
- actual = array.groupby("x").quantile(0.5)
- assert_identical(expected, actual)
+
+ with xr.set_options(use_flox=use_flox):
+ actual = array.groupby("x").quantile(0.5)
+ assert_identical(expected, actual)
# Vector quantile
expected = xr.DataArray(
@@ -345,7 +345,8 @@ def test_da_groupby_quantile() -> None:
coords={"x": [1, 2], "quantile": [0, 1]},
dims=("x", "quantile"),
)
- actual = array.groupby("x").quantile([0, 1])
+ with xr.set_options(use_flox=use_flox):
+ actual = array.groupby("x").quantile([0, 1])
assert_identical(expected, actual)
array = xr.DataArray(
@@ -356,7 +357,8 @@ def test_da_groupby_quantile() -> None:
e = [np.nan, 5] if skipna is False else [2.5, 5]
expected = xr.DataArray(data=e, coords={"x": [1, 2], "quantile": 0.5}, dims="x")
- actual = array.groupby("x").quantile(0.5, skipna=skipna)
+ with xr.set_options(use_flox=use_flox):
+ actual = array.groupby("x").quantile(0.5, skipna=skipna)
assert_identical(expected, actual)
# Multiple dimensions
From 3d6e76a29a328489b0867a89fce1c157605c5f5d Mon Sep 17 00:00:00 2001
From: Deepak Cherian <dcherian@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:28:29 -0600
Subject: [PATCH 2/2] Apply suggestions from code review
Co-authored-by: Michael Niklas <mick.niklas@gmail.com>
---
xarray/tests/test_groupby.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xarray/tests/test_groupby.py b/xarray/tests/test_groupby.py
index 2349ff0adfd..7dd6cdb622d 100644
--- a/xarray/tests/test_groupby.py
+++ b/xarray/tests/test_groupby.py
@@ -324,8 +324,8 @@ def test_dask_da_groupby_median() -> None:
assert_identical(expected, actual)
-@pytest.mark.parametrize("use_flox", [True, False])
-def test_da_groupby_quantile(use_flox) -> None:
+@pytest.mark.parametrize("use_flox", [pytest.param(True, marks=requires_flox), False])
+def test_da_groupby_quantile(use_flox: bool) -> None:
array = xr.DataArray(
data=[1, 2, 3, 4, 5, 6], coords={"x": [1, 1, 1, 2, 2, 2]}, dims="x"
)

66
changelog Normal file
View File

@@ -0,0 +1,66 @@
* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.2-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun Jul 04 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.18.2-2
- Backport fixes to tests
* Thu Jun 17 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.18.2-1
- Update to latest version (#1957925)
- Skip failing tests (#1969172)
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.17.0-2
- Rebuilt for Python 3.10
* Sat Mar 13 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.17.0-1
- Update to latest version (#1933230)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Dec 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.16.2-1
- Update to latest version (#1902888)
* Sat Sep 26 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.16.1-1
- Update to latest version (#1880864)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Jul 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.16.0-1
- Update to latest version
* Tue Jun 23 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-3
- Backport patch to fix tests catching too many warnings
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.15.1-3
- Rebuilt for Python 3.9
* Sat Apr 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-2
- Fix broken install with missing files
- Test against installed version to catch above issue
- Add more test dependencies
* Wed Mar 25 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-1
- Update to latest version
* Fri Mar 06 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.0-2
- Backport fix for seaborn 0.10.0
* Sat Feb 08 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.0-1
- Update to latest version
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.3-3
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jul 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.3-1
- Update to latest version
* Sat Mar 16 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.0-1
- Initial package.

View File

@@ -1,43 +1,34 @@
%global srcname xarray
%global data_commit 870b5d7a9dbfa821423f1b88056890c22341f085
%bcond_with docs
Name: python-%{srcname}
Version: 0.15.1
Release: 2%{?dist}
Version: 2025.1.1
Release: %autorelease
Summary: N-D labeled arrays and datasets in Python
License: ASL 2.0
License: Apache-2.0
URL: https://github.com/pydata/xarray
Source0: %pypi_source
# Data for examples only.
Source1: https://github.com/pydata/xarray-data/archive/%{data_commit}/xarray-data-%{data_commit}.tar.gz
Source2: https://github.com/mapbox/rasterio/raw/1.0.21/tests/data/RGB.byte.tif
# All Fedora specific.
Patch0001: 0001-DOC-Don-t-download-RGB.byte.tif-during-build.patch
Patch0002: 0002-DOC-Skip-examples-using-unpackaged-dependencies.patch
Patch0003: 0003-DOC-Don-t-print-out-conda-pip-environment.patch
# https://github.com/pydata/xarray/pull/3274
Patch0004: 0004-Use-drawstyle-instead-of-linestyle-in-plot.step.patch
Source: %pypi_source %{srcname}
# Fix test_dask_da_groupby_quantile.
Patch: https://github.com/pydata/xarray/pull/9945.patch
# https://github.com/pydata/xarray/pull/9949
Patch: 0001-Fix-test_doc_example-on-big-endian-systems.patch
# https://github.com/pydata/xarray/pull/9964
Patch: 0002-Avoid-unsafe-casts-from-float-to-unsigned-int.patch
Patch: 0003-tests-epel10.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3dist(cftime) >= 1
BuildRequires: python3-dask+array
BuildRequires: python3-dask+dataframe
BuildRequires: python3dist(netcdf4) >= 1.4
BuildRequires: python3dist(numpy) >= 1.15
BuildRequires: python3dist(pandas) >= 0.25
BuildRequires: python3dist(pint)
BuildRequires: python3dist(bottleneck)
BuildRequires: python3dist(dask[array]) >= 2023.9
BuildRequires: python3dist(dask[dataframe]) >= 2023.9
BuildRequires: python3dist(pint) >= 0.16
BuildRequires: python3dist(pytest) >= 2.7.1
BuildRequires: python3dist(pytest-xdist)
BuildRequires: python3dist(rasterio) >= 1
BuildRequires: python3dist(seaborn)
BuildRequires: python3dist(setuptools) >= 41.2
BuildRequires: python3dist(setuptools-scm)
BuildRequires: python3dist(zarr) >= 2.3
BuildRequires: python3dist(rasterio) >= 1.1
BuildRequires: python3dist(seaborn) >= 0.11
%global _description %{expand: \
Xarray (formerly xray) is an open source project and Python package that
@@ -52,114 +43,45 @@ for advanced analytics and visualization with these data structures.
Xarray was inspired by and borrows heavily from pandas, the popular data
analysis package focused on labelled tabular data. It is particularly
tailored to working with netCDF files, which were the source of xarray's
tailored to working with netCDF files, which were the source of xarrays
data model, and integrates tightly with dask for parallel computing.}
%description %{_description}
%package -n python3-%{srcname}
Summary: %{summary}
%{?python_provide:%python_provide python3-%{srcname}}
%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)
BuildRequires: python3dist(netcdf4)
BuildRequires: python3dist(numpydoc)
BuildRequires: python3dist(rasterio)
BuildRequires: python3dist(sphinx)
BuildRequires: python3dist(sphinx-gallery)
BuildRequires: python3dist(sphinx-rtd-theme)
BuildRequires: python3dist(zarr)
%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/~'
cp -p %SOURCE2 ./doc/gallery/
%endif
%generate_buildrequires
%pyproject_buildrequires -x io
%build
%py3_build
%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
%pyproject_wheel
%install
%py3_install
%pyproject_install
%pyproject_save_files -l %{srcname}
%check
rm -rf xarray
PYTHONPATH=%{buildroot}%{python3_sitelib} \
pytest-3 -ra -n auto -m "not network" --pyargs xarray
pytest_args=(
-n auto
-m "not network"
# this test somehow crashes python interpreter entirely, was xfail upstream till recently
-k 'not test_save_mfdataset_compute_false_roundtrip'
)
%files -n python3-%{srcname}
%license LICENSE licenses/DASK_LICENSE licenses/NUMPY_LICENSE licenses/PANDAS_LICENSE licenses/PYTHON_LICENSE licenses/SEABORN_LICENSE
%doc README.rst
%{python3_sitelib}/%{srcname}
%{python3_sitelib}/%{srcname}-%{version}-py*.egg-info
%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
%{pytest} -ra "${pytest_args[@]}" --pyargs xarray
%files -n python3-%{srcname} -f %{pyproject_files}
%license licenses/*
%doc README.md
%changelog
* Sat Apr 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-2
- Fix broken install with missing files
- Test against installed version to catch above issue
- Add more test dependencies
* Wed Mar 25 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-1
- Update to latest version
* Fri Mar 06 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.0-2
- Backport fix for seaborn 0.10.0
* Sat Feb 08 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.0-1
- Update to latest version
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.3-3
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jul 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.3-1
- Update to latest version
* Sat Mar 16 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.0-1
- Initial package.
%autochangelog

View File

@@ -1,3 +1 @@
SHA512 (xarray-0.15.1.tar.gz) = 8a2d7e9173c51c65ffe856fa83df730e0e7de9777726c6d6e8f7f4edcc512b3a980c7dc854c19d3bc4bec50e815ad776bd433a5750680f2851a2b0b1f505ea14
SHA512 (xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz) = 27de6e274d18d266d6d8a1f0c8f65396fff16d177cf6df41cfd4bcf839e6d083512c4f4dbc1163ab7380a8905acecfe15b7978e23b9c360bad2dd879addb421c
SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd
SHA512 (xarray-2025.1.1.tar.gz) = a0cde2c8e38887878bcde25fd3ea6ee436b522ca73f52359d2c8ac1993447472d7cd5e5d4b11016ec48d1b86dba08e9207caf00b2b43ab896c777395e51f7943