From 7aca2e8d6891641973a1b58c7e6ef03f9673a9ea Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 11 Nov 2024 07:09:04 -0500 Subject: [PATCH] Update to latest version (#2245099) --- .gitignore | 1 + ...amples-using-unpackaged-dependencies.patch | 12 +-- ...on-t-print-out-conda-pip-environment.patch | 8 +- 0003-Fix-tests-on-big-endian-systems.patch | 78 ------------------- python-xarray.spec | 10 +-- sources | 2 +- 6 files changed, 16 insertions(+), 95 deletions(-) delete mode 100644 0003-Fix-tests-on-big-endian-systems.patch diff --git a/.gitignore b/.gitignore index 00035b2..91e8e1a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /xarray-2023.9.0.tar.gz /xarray-2024.6.0.tar.gz /xarray-2024.7.0.tar.gz +/xarray-2024.10.0.tar.gz diff --git a/0001-DOC-Skip-examples-using-unpackaged-dependencies.patch b/0001-DOC-Skip-examples-using-unpackaged-dependencies.patch index 9e9934d..306befb 100644 --- a/0001-DOC-Skip-examples-using-unpackaged-dependencies.patch +++ b/0001-DOC-Skip-examples-using-unpackaged-dependencies.patch @@ -1,7 +1,7 @@ -From 955e5695e632ec368e25ca2d4afdb7d669a17bfe Mon Sep 17 00:00:00 2001 +From 0265d68ed1f82dd36aa78ce77fdaa69f802f66b0 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:48:25 -0400 -Subject: [PATCH 1/3] DOC: Skip examples using unpackaged dependencies. +Subject: [PATCH 1/2] DOC: Skip examples using unpackaged dependencies. Signed-off-by: Elliott Sales de Andrade --- @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 2 insertions(+) diff --git a/doc/user-guide/io.rst b/doc/user-guide/io.rst -index 85c47334..2a03cb4e 100644 +index f4b3e5ab..3db742ee 100644 --- a/doc/user-guide/io.rst +++ b/doc/user-guide/io.rst -@@ -1072,6 +1072,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using +@@ -1077,6 +1077,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using :py:meth:`DataArray.to_iris`: .. ipython:: python @@ -20,7 +20,7 @@ index 85c47334..2a03cb4e 100644 da = xr.DataArray( np.random.rand(4, 5), -@@ -1086,6 +1087,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using +@@ -1091,6 +1092,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using :py:meth:`DataArray.from_iris`: .. ipython:: python @@ -29,5 +29,5 @@ index 85c47334..2a03cb4e 100644 da_cube = xr.DataArray.from_iris(cube) da_cube -- -2.45.2 +2.47.0 diff --git a/0002-DOC-Don-t-print-out-conda-pip-environment.patch b/0002-DOC-Don-t-print-out-conda-pip-environment.patch index 1be51ff..4175c0a 100644 --- a/0002-DOC-Don-t-print-out-conda-pip-environment.patch +++ b/0002-DOC-Don-t-print-out-conda-pip-environment.patch @@ -1,7 +1,7 @@ -From 1b0312ce5e355ba1e9ecb6838817a9ba1154bf8c Mon Sep 17 00:00:00 2001 +From 11411fe78441e6e390c53ebe5d85311f4f1d04cc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 02:59:15 -0400 -Subject: [PATCH 2/3] DOC: Don't print out conda/pip environment. +Subject: [PATCH 2/2] DOC: Don't print out conda/pip environment. Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 8 deletions(-) diff --git a/doc/conf.py b/doc/conf.py -index 4f1fc675..3415bcd0 100644 +index d4328dbf..23928bd1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -16,7 +16,6 @@ import datetime @@ -35,5 +35,5 @@ index 4f1fc675..3415bcd0 100644 with suppress(ImportError): -- -2.45.2 +2.47.0 diff --git a/0003-Fix-tests-on-big-endian-systems.patch b/0003-Fix-tests-on-big-endian-systems.patch deleted file mode 100644 index 16d5e7e..0000000 --- a/0003-Fix-tests-on-big-endian-systems.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b2594026663f5d61b5a3e01e790c2a1c8e3e72a8 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Mon, 19 Aug 2024 01:16:05 -0400 -Subject: [PATCH 3/3] Fix tests on big-endian systems - -There is nothing in the data created in these tests that requires them -to be little endian, so the dtype comparison should be for native byte -order. - -Signed-off-by: Elliott Sales de Andrade ---- - xarray/tests/test_backends.py | 6 +++--- - xarray/tests/test_coding_times.py | 4 ++-- - xarray/tests/test_dask.py | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/xarray/tests/test_backends.py b/xarray/tests/test_backends.py -index 4fa87364..0ae3062c 100644 ---- a/xarray/tests/test_backends.py -+++ b/xarray/tests/test_backends.py -@@ -872,7 +872,7 @@ class CFEncodedBase(DatasetIOBase): - if actual["a"].dtype.metadata is not None: - assert check_vlen_dtype(actual["a"].dtype) is str - else: -- assert actual["a"].dtype == np.dtype("= 1.2 -BuildRequires: python3dist(dask[array]) >= 2.30 -BuildRequires: python3dist(dask[dataframe]) >= 2.30 +BuildRequires: python3dist(dask[array]) >= 2023.9 +BuildRequires: python3dist(dask[dataframe]) >= 2023.9 BuildRequires: python3dist(netcdf4) >= 1.5 BuildRequires: python3dist(pint) >= 0.16 BuildRequires: python3dist(pytest) >= 2.7.1 BuildRequires: python3dist(pytest-xdist) BuildRequires: python3dist(rasterio) >= 1.1 BuildRequires: python3dist(seaborn) >= 0.11 -BuildRequires: python3dist(zarr) >= 2.5 +BuildRequires: python3dist(zarr) >= 2.16 %global _description %{expand: \ Xarray (formerly xray) is an open source project and Python package that diff --git a/sources b/sources index b0ccb4c..cc182b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xarray-2024.7.0.tar.gz) = 6a094dacdd8f09fb4674c67e03e1df67d0651053088fe39912713842dddb397cf5b5629193df170a4738dc8f75e96ae26582c73fac4679a1439e9d015dfcfcd1 +SHA512 (xarray-2024.10.0.tar.gz) = 3a17548cdc3d3b6123c81c124a47b1e538b223e8955593064b37dcc23f61b7cbaf62df57d74a0b8f8cd55f21bfd1a8c69622cb328d08e4212cf0c16d464416dd SHA512 (xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz) = 3734ad5649b9ba23e8fe52ac1fc34694dcb3c761a1817e520726a83d31e725e2448aa0109ad7ad385572ae7d6a285bf1407d104f87227127a6a51d73b797a952