Update to latest version.

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

.gitignore

@@ -8,3 +8,4 @@
 /xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz
 /xarray-0.16.1.tar.gz
 /xarray-0.16.2.tar.gz
+/xarray-0.17.0.tar.gz

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

@@ -1,4 +1,4 @@
-From e1fe3194dcf9878b2e1895404ff13c0338ad0e1f Mon Sep 17 00:00:00 2001
+From d1bff712ac7f0d65d943c77de7008fd192eae919 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.
@@ -36,5 +36,5 @@ index 758d4cd3..f2a7b2db 100644
  
  # The data is in UTM projection. We have to set it manually until
 -- 
-2.26.2
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 1f0ab97be49d2fef87f0da7ca2bab33be41e2480 Mon Sep 17 00:00:00 2001
+From 98140b3ff72134777959896d128e5049c182eaa7 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.
@@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/doc/io.rst b/doc/io.rst
-index 5119bac1..a2d70436 100644
+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
@@ -29,5 +29,5 @@ index 5119bac1..a2d70436 100644
      da_cube = xr.DataArray.from_iris(cube)
      da_cube
 -- 
-2.26.2
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From cc094db443b53f96b32708676e515658ada8313f Mon Sep 17 00:00:00 2001
+From 16fd494e4f98eb702838ae980f20c2303241f19c 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.
@@ -9,7 +9,7 @@ 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 74c3fd12..27a2f7b7 100644
+index db7229cf..b15e8073 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
 @@ -15,7 +15,6 @@
@@ -29,11 +29,11 @@ index 74c3fd12..27a2f7b7 100644
 -    subprocess.run(["conda", "list"])
 -else:
 -    print("pip environment:")
--    subprocess.run(["pip", "list"])
+-    subprocess.run([sys.executable, "-m", "pip", "list"])
 -
  print(f"xarray: {xarray.__version__}, {xarray.__file__}")
  
  with suppress(ImportError):
 -- 
-2.26.2
+2.29.2
 

0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch

@@ -1,48 +0,0 @@
-From 507bf6860cc59d7a1320e39b4138418874f7ca15 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 26 Sep 2020 23:10:31 -0400
-Subject: [PATCH 4/4] Revert "un-xfail the pint assert_allclose and
- assert_duckarray_equal tests"
-
-This reverts commit e045bd3e1dcbeedd31205d8ceb4186e28edc6cc2.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- xarray/tests/test_testing.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/xarray/tests/test_testing.py b/xarray/tests/test_testing.py
-index 30ea6aaa..0f2ae8b3 100644
---- a/xarray/tests/test_testing.py
-+++ b/xarray/tests/test_testing.py
-@@ -70,7 +70,12 @@ def test_assert_allclose(obj1, obj2):
-         pytest.param(
-             quantity,
-             id="pint",
--            marks=pytest.mark.skipif(not has_pint, reason="requires pint"),
-+            marks=[
-+                pytest.mark.skipif(not has_pint, reason="requires pint"),
-+                pytest.mark.xfail(
-+                    reason="inconsistencies in the return value of pint's implementation of eq"
-+                ),
-+            ],
-         ),
-     ),
- )
-@@ -110,7 +115,12 @@ def test_assert_duckarray_equal_failing(duckarray, obj1, obj2):
-         pytest.param(
-             quantity,
-             id="pint",
--            marks=pytest.mark.skipif(not has_pint, reason="requires pint"),
-+            marks=[
-+                pytest.mark.skipif(not has_pint, reason="requires pint"),
-+                pytest.mark.xfail(
-+                    reason="inconsistencies in the return value of pint's implementation of eq"
-+                ),
-+            ],
-         ),
-     ),
- )
--- 
-2.26.2
-

4256.patch

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

python-xarray.spec

@@ -4,7 +4,7 @@
 %bcond_with docs
 
 Name:           python-%{srcname}
-Version:        0.16.2
+Version:        0.17.0
 Release:        1%{?dist}
 Summary:        N-D labeled arrays and datasets in Python
 
@@ -18,26 +18,26 @@ Source2:        https://github.com/mapbox/rasterio/raw/1.0.21/tests/data/RGB.byt
 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
-# We do not have new enough pint.
-Patch0004:      0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.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
-BuildRequires:  python3-dask+dataframe
-BuildRequires:  python3dist(netcdf4) >= 1.4
-BuildRequires:  python3dist(numpy) >= 1.15
-BuildRequires:  python3dist(pandas) >= 0.25
+BuildRequires:  python3-dask+array >= 2.11
+BuildRequires:  python3-dask+dataframe >= 2.11
+BuildRequires:  python3dist(netcdf4) >= 1.5
+BuildRequires:  python3dist(numpy) >= 1.17
+BuildRequires:  python3dist(pandas) >= 1
 BuildRequires:  python3dist(pint)
 BuildRequires:  python3dist(pytest) >= 2.7.1
 BuildRequires:  python3dist(pytest-xdist)
-BuildRequires:  python3dist(rasterio) >= 1
-BuildRequires:  python3dist(seaborn)
+BuildRequires:  python3dist(rasterio) >= 1.1
+BuildRequires:  python3dist(seaborn) >= 0.10
 BuildRequires:  python3dist(setuptools) >= 41.2
 BuildRequires:  python3dist(setuptools-scm)
-BuildRequires:  python3dist(zarr) >= 2.3
+BuildRequires:  python3dist(zarr) >= 2.4
 
 %global _description %{expand: \
 Xarray (formerly xray) is an open source project and Python package that
@@ -75,12 +75,9 @@ BuildRequires:  natural-earth-map-data-10m
 BuildRequires:  python3-ipython-sphinx
 BuildRequires:  python3dist(jupyter-client)
 BuildRequires:  python3dist(matplotlib)
-BuildRequires:  python3dist(netcdf4)
-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
@@ -133,6 +130,12 @@ 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)
 

sources

@@ -1,3 +1,3 @@
-SHA512 (xarray-0.16.2.tar.gz) = f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
+SHA512 (xarray-0.17.0.tar.gz) = 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
 SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29
 SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd