Update to latest version (#2095334)

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -9,3 +9,13 @@
 /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

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

@@ -1,7 +1,7 @@
-From d1bff712ac7f0d65d943c77de7008fd192eae919 Mon Sep 17 00:00:00 2001
+From 338e50f33a7d286f592a64278349f380f108340c 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.
+Subject: [PATCH 1/3] DOC: Don't download RGB.byte.tif during build.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
@@ -10,31 +10,31 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  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
+index 853923a3..bc8b4421 100644
 --- a/doc/gallery/plot_rasterio.py
 +++ b/doc/gallery/plot_rasterio.py
-@@ -23,7 +23,7 @@ from rasterio.warp import transform
+@@ -23,7 +23,7 @@ from pyproj import Transformer
  import xarray as xr
  
  # Read the data
--url = "https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif"
+-url = "https://github.com/rasterio/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
+ # Compute the lon/lat coordinates with pyproj
 diff --git a/doc/gallery/plot_rasterio_rgb.py b/doc/gallery/plot_rasterio_rgb.py
-index 758d4cd3..f2a7b2db 100644
+index 912224ac..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 = "https://github.com/rasterio/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.29.2
+2.36.1
 

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

@@ -1,18 +1,18 @@
-From 98140b3ff72134777959896d128e5049c182eaa7 Mon Sep 17 00:00:00 2001
+From 09bf051c792f195465c7330b57be204605b88d2c 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.
+Subject: [PATCH 2/3] DOC: Skip examples using unpackaged dependencies.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- doc/io.rst | 2 ++
+ doc/user-guide/io.rst | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/doc/io.rst b/doc/io.rst
-index c2022cc9..fb9cba9c 100644
---- a/doc/io.rst
-+++ b/doc/io.rst
-@@ -510,6 +510,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
+diff --git a/doc/user-guide/io.rst b/doc/user-guide/io.rst
+index beab5fc0..1109e578 100644
+--- a/doc/user-guide/io.rst
++++ b/doc/user-guide/io.rst
+@@ -857,6 +857,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
  :py:meth:`DataArray.to_iris`:
  
  .. ipython:: python
@@ -20,7 +20,7 @@ index c2022cc9..fb9cba9c 100644
  
      da = xr.DataArray(
          np.random.rand(4, 5),
-@@ -524,6 +525,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
+@@ -871,6 +872,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 c2022cc9..fb9cba9c 100644
      da_cube = xr.DataArray.from_iris(cube)
      da_cube
 -- 
-2.29.2
+2.36.1
 

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

@@ -1,7 +1,7 @@
-From 16fd494e4f98eb702838ae980f20c2303241f19c Mon Sep 17 00:00:00 2001
+From a0c1d288ae09cbe8055b4531dffe285aa8b549b4 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.
+Subject: [PATCH 3/3] DOC: Don't print out conda/pip environment.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
@@ -9,24 +9,24 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  1 file changed, 8 deletions(-)
 
 diff --git a/doc/conf.py b/doc/conf.py
-index db7229cf..b15e8073 100644
+index 7e28953b..49bfdaca 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
-@@ -15,7 +15,6 @@
- import datetime
+@@ -16,7 +16,6 @@ import datetime
+ import inspect
  import os
  import pathlib
 -import subprocess
  import sys
  from contextlib import suppress
- 
-@@ -29,13 +28,6 @@ allowed_failures = set()
+ from textwrap import dedent, indent
+@@ -35,13 +34,6 @@ allowed_failures = set()
  print("python exec:", sys.executable)
  print("sys.path:", sys.path)
  
--if "conda" in sys.executable:
+-if "CONDA_DEFAULT_ENV" in os.environ or "conda" in sys.executable:
 -    print("conda environment:")
--    subprocess.run(["conda", "list"])
+-    subprocess.run([os.environ.get("CONDA_EXE", "conda"), "list"])
 -else:
 -    print("pip environment:")
 -    subprocess.run([sys.executable, "-m", "pip", "list"])
@@ -35,5 +35,5 @@ index db7229cf..b15e8073 100644
  
  with suppress(ImportError):
 -- 
-2.29.2
+2.36.1
 

4256.patch

@@ -1,51 +0,0 @@
-From 9d1c3cb5d7fba68c0dc675dd80825cac8b644e01 Mon Sep 17 00:00:00 2001
-From: Keewis <keewis@posteo.de>
-Date: Sat, 6 Mar 2021 23:16:57 +0100
-Subject: [PATCH 1/3] duplicate the level if a single level was passed
-
----
- xarray/plot/utils.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
-index 5510cf7f21..57cdf9f45d 100644
---- a/xarray/plot/utils.py
-+++ b/xarray/plot/utils.py
-@@ -60,6 +60,11 @@ def _build_discrete_cmap(cmap, levels, extend, filled):
-     """
-     import matplotlib as mpl
- 
-+    if isinstance(levels, (int, float)):
-+        levels = [levels, levels]
-+    elif len(levels) == 1:
-+        levels = [levels[0], levels[0]]
-+
-     if not filled:
-         # non-filled contour plots
-         extend = "max"
-
-From 7977ce0fa25971abc50a5dd010d15d71f8013a84 Mon Sep 17 00:00:00 2001
-From: Keewis <keewis@posteo.de>
-Date: Sat, 6 Mar 2021 23:29:39 +0100
-Subject: [PATCH 2/3] don't handle scalars
-
-it seems these will never be passed at that level
----
- xarray/plot/utils.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
-index 57cdf9f45d..a83bc28e27 100644
---- a/xarray/plot/utils.py
-+++ b/xarray/plot/utils.py
-@@ -60,9 +60,7 @@ def _build_discrete_cmap(cmap, levels, extend, filled):
-     """
-     import matplotlib as mpl
- 
--    if isinstance(levels, (int, float)):
--        levels = [levels, levels]
--    elif len(levels) == 1:
-+    if len(levels) == 1:
-         levels = [levels[0], levels[0]]
- 
-     if not filled:

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,43 +1,38 @@
 %global srcname xarray
-%global data_commit 5fdb22b5613ba8176b9f6fa67be783d7810643eb
+%global data_commit 86974d54ce83a130303fe8caa629e60deb3cb6e5
 
 %bcond_with docs
 
 Name:           python-%{srcname}
-Version:        0.17.0
-Release:        1%{?dist}
+Version:        2022.6.0
+Release:        %autorelease
 Summary:        N-D labeled arrays and datasets in Python
 
 License:        ASL 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
+Source2:        https://github.com/rasterio/rasterio/raw/1.2.10/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
-# Fix tests with Matplotlib 3.4.
-Patch0004:      https://github.com/pydata/xarray/pull/4256.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
-BuildRequires:  python3dist(cftime) >= 1
-BuildRequires:  python3-dask+array >= 2.11
-BuildRequires:  python3-dask+dataframe >= 2.11
+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(numpy) >= 1.17
-BuildRequires:  python3dist(pandas) >= 1
-BuildRequires:  python3dist(pint)
+BuildRequires:  python3dist(pint) >= 0.16
 BuildRequires:  python3dist(pytest) >= 2.7.1
 BuildRequires:  python3dist(pytest-xdist)
 BuildRequires:  python3dist(rasterio) >= 1.1
-BuildRequires:  python3dist(seaborn) >= 0.10
-BuildRequires:  python3dist(setuptools) >= 41.2
-BuildRequires:  python3dist(setuptools-scm)
-BuildRequires:  python3dist(zarr) >= 2.4
+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
@@ -60,7 +55,6 @@ 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}
 
@@ -74,7 +68,7 @@ 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(matplotlib) >= 3.3
 BuildRequires:  python3dist(sphinx)
 BuildRequires:  python3dist(sphinx-gallery)
 BuildRequires:  python3dist(sphinx-rtd-theme)
@@ -94,8 +88,12 @@ cp -p %SOURCE2 ./doc/gallery/
 %endif
 
 
+%generate_buildrequires
+%pyproject_buildrequires -r
+
+
 %build
-%py3_build
+%pyproject_wheel
 
 %if %{with docs}
 # generate html docs
@@ -108,19 +106,24 @@ popd
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files %{srcname}
 
 
 %check
 rm -rf xarray
-%{pytest} -ra -n auto -m "not network" --pyargs xarray
+
+pytest_args=(
+  -n auto
+  -m "not network"
+)
+
+%{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
@@ -130,55 +133,4 @@ rm -rf xarray
 
 
 %changelog
-* 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.
+%autochangelog

sources

@@ -1,3 +1,3 @@
-SHA512 (xarray-0.17.0.tar.gz) = 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
-SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29
+SHA512 (xarray-2022.6.0.tar.gz) = 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
+SHA512 (xarray-data-86974d54ce83a130303fe8caa629e60deb3cb6e5.tar.gz) = c7cddd4de81908110f65fac9df63b68ade0d37b9983b2bf7a6d5021e419d5b7e23e6bee316be4f802a7fbd70952bb5e3eead91d544c8b8bd6ffb2747d3fca64f
 SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd