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

[skip changelog]

.gitignore

@@ -2,3 +2,26 @@
 /xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz
 /RGB.byte.tif
 /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

0001-DOC-Don-t-download-RGB.byte.tif-during-build.patch

@@ -1,40 +0,0 @@
-From 63fc5acba81601e473ead5c4e82de78b5ae61ad0 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 82d5ce61..24502f10 100644
---- a/doc/gallery/plot_rasterio.py
-+++ b/doc/gallery/plot_rasterio.py
-@@ -24,7 +24,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 23a56d5a..468e2bab 100644
---- a/doc/gallery/plot_rasterio_rgb.py
-+++ b/doc/gallery/plot_rasterio_rgb.py
-@@ -19,7 +19,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.0
-

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

@@ -0,0 +1,33 @@
+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
+

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

@@ -0,0 +1,39 @@
+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-DOC-Skip-examples-using-unpackaged-dependencies.patch

@@ -1,33 +0,0 @@
-From 90f116ffbf6eb403d4ddd44e6b9bafddced99419 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 85cb73a0..60990627 100644
---- a/doc/io.rst
-+++ b/doc/io.rst
-@@ -373,6 +373,7 @@ installed xarray can convert a ``DataArray`` into a ``Cube`` using
- :py:meth:`~xarray.DataArray.to_iris`:
- 
- .. ipython:: python
-+    :verbatim:
- 
-     da = xr.DataArray(np.random.rand(4, 5), dims=['x', 'y'],
-                       coords=dict(x=[10, 20, 30, 40],
-@@ -385,6 +386,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
- :py:meth:`~xarray.DataArray.from_iris`:
- 
- .. ipython:: python
-+    :verbatim:
- 
-     da_cube = xr.DataArray.from_iris(cube)
-     da_cube
--- 
-2.21.0
-

0003-TST-Reduce-required-pytest-runner-version.patch

@@ -1,26 +0,0 @@
-From 2b193b193b422b322a5f5e6475ce72d9a453fb9f Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 16 Mar 2019 02:42:37 -0400
-Subject: [PATCH 3/4] TST: Reduce required pytest-runner version.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index f24392db..af5190f3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,7 +25,7 @@ CLASSIFIERS = [
- PYTHON_REQUIRES = '>=3.5'
- INSTALL_REQUIRES = ['numpy >= 1.12', 'pandas >= 0.19.2']
- needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
--SETUP_REQUIRES = ['pytest-runner >= 4.2'] if needs_pytest else []
-+SETUP_REQUIRES = ['pytest-runner >= 4.0'] if needs_pytest else []
- TESTS_REQUIRE = ['pytest >= 2.7.1']
- 
- DESCRIPTION = "N-D labeled arrays and datasets in Python"
--- 
-2.21.0
-

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

@@ -1,31 +0,0 @@
-From 46ca88294c55170c442417f7341571079f1bc2a9 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 4/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 23766946..33bfcf9d 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -26,13 +26,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.0
-

8186.patch

@@ -0,0 +1,29 @@
+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
+ 
+ 

changelog

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

python-xarray.spec

@@ -1,35 +1,36 @@
 %global srcname xarray
-%global data_commit 870b5d7a9dbfa821423f1b88056890c22341f085
+%global data_commit 7d8290e0be9d2a8f4b4381641f20a97db6eaea3d
+
+%bcond_with docs
 
 Name:           python-%{srcname}
-Version:        0.12.3
-Release:        1%{?dist}
+Version:        2023.9.0
+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
+Source0:        %pypi_source %{srcname}
 # 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-TST-Reduce-required-pytest-runner-version.patch
-Patch0004:      0004-DOC-Don-t-print-out-conda-pip-environment.patch
+Patch0001:      0001-DOC-Skip-examples-using-unpackaged-dependencies.patch
+Patch0002:      0002-DOC-Don-t-print-out-conda-pip-environment.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-dask+array
-BuildRequires:  python3-dask+dataframe
-BuildRequires:  python3dist(numpy) >= 1.12
-BuildRequires:  python3dist(pandas) >= 0.19.2
+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(pytest) >= 2.7.1
-BuildRequires:  python3dist(pytest-runner)
 BuildRequires:  python3dist(pytest-xdist)
-BuildRequires:  python3dist(seaborn)
-BuildRequires:  python3dist(setuptools)
+BuildRequires:  python3dist(rasterio) >= 1.1
+BuildRequires:  python3dist(seaborn) >= 0.11
+BuildRequires:  python3dist(zarr) >= 2.5
 
 %global _description %{expand: \
 Xarray (formerly xray) is an open source project and Python package that
@@ -44,7 +45,7 @@ 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 xarray’s
 data model, and integrates tightly with dask for parallel computing.}
 
 %description %{_description}
@@ -52,44 +53,83 @@ data model, and integrates tightly with dask for parallel computing.}
 
 %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) >= 3.3
+BuildRequires:  python3dist(sphinx)
+BuildRequires:  python3dist(sphinx-gallery)
+BuildRequires:  python3dist(sphinx-rtd-theme)
+
+%description -n python-%{srcname}-doc
+Documentation for xarray
+%endif
+
+
 %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
 
-# Remove bundled egg-info
-rm -rf %{srcname}.egg-info
+
+%generate_buildrequires
+%pyproject_buildrequires -r
 
 
 %build
-%py3_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
-%py3_install
+%pyproject_install
+%pyproject_save_files %{srcname}
 
 
 %check
-%{__python3} setup.py test --addopts='-ra -n auto -m "not network"'
+rm -rf xarray
+
+pytest_args=(
+  -n auto
+  -m "not network"
+  # https://github.com/pydata/xarray/issues/7513
+  -k 'not test_open_mfdataset_manyfiles'
+)
+
+%{pytest} -ra "${pytest_args[@]}" --pyargs xarray
 
 
-%files -n python3-%{srcname}
+%files -n python3-%{srcname} -f %{pyproject_files}
 %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
+%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
-* 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

sources

@@ -1,3 +1,2 @@
-SHA512 (xarray-0.12.3.tar.gz) = bac585362920f22b128ea75d5434ff1e9494cc4b8bafbb11533e80f3e09fe18e580e3e0dd9696bd906ac552ce5eb134e92019f6d2a7b1af0d38d27ac6589a846
-SHA512 (xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz) = 27de6e274d18d266d6d8a1f0c8f65396fff16d177cf6df41cfd4bcf839e6d083512c4f4dbc1163ab7380a8905acecfe15b7978e23b9c360bad2dd879addb421c
-SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd
+SHA512 (xarray-2023.9.0.tar.gz) = d6c1e6ff438415766dedada5841413b9c7514dc2b1bf71a4adb17df4d78b68f5f22cded09c20511e4e2e85ac3284c447fc13191397b7ae77d1294d7867e3ac3f
+SHA512 (xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz) = 3734ad5649b9ba23e8fe52ac1fc34694dcb3c761a1817e520726a83d31e725e2448aa0109ad7ad385572ae7d6a285bf1407d104f87227127a6a51d73b797a952