From 924dddb55ec18e36ead1da8a543436823b24055f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 12 Dec 2020 19:03:21 -0500 Subject: [PATCH] Update to latest version. --- .gitignore | 1 + ...-DOC-Don-t-download-RGB.byte.tif-during-build.patch | 2 +- ...C-Skip-examples-using-unpackaged-dependencies.patch | 8 ++++---- 0003-DOC-Don-t-print-out-conda-pip-environment.patch | 10 +++++----- ...un-xfail-the-pint-assert_allclose-and-assert_.patch | 2 +- python-xarray.spec | 5 ++++- sources | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 63257d4..6c867d9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xarray-0.16.0.tar.gz /xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz /xarray-0.16.1.tar.gz +/xarray-0.16.2.tar.gz diff --git a/0001-DOC-Don-t-download-RGB.byte.tif-during-build.patch b/0001-DOC-Don-t-download-RGB.byte.tif-during-build.patch index 88f3be2..8b45518 100644 --- a/0001-DOC-Don-t-download-RGB.byte.tif-during-build.patch +++ b/0001-DOC-Don-t-download-RGB.byte.tif-during-build.patch @@ -1,4 +1,4 @@ -From 6e8b1e5bd01319a847263109597f153f7f8322b2 Mon Sep 17 00:00:00 2001 +From e1fe3194dcf9878b2e1895404ff13c0338ad0e1f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:31:18 -0400 Subject: [PATCH 1/4] DOC: Don't download RGB.byte.tif during build. diff --git a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch index 6ef7179..368a80d 100644 --- a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch +++ b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch @@ -1,4 +1,4 @@ -From 42e1c13758d01b83d30d6a6647e85ab6cf9560b5 Mon Sep 17 00:00:00 2001 +From 1f0ab97be49d2fef87f0da7ca2bab33be41e2480 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:48:25 -0400 Subject: [PATCH 2/4] DOC: Skip examples using unpackaged dependencies. @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 2 insertions(+) diff --git a/doc/io.rst b/doc/io.rst -index 4aac5e0b..5f8d3871 100644 +index 5119bac1..a2d70436 100644 --- a/doc/io.rst +++ b/doc/io.rst -@@ -504,6 +504,7 @@ installed xarray can convert a ``DataArray`` into a ``Cube`` using +@@ -510,6 +510,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using :py:meth:`DataArray.to_iris`: .. ipython:: python @@ -20,7 +20,7 @@ index 4aac5e0b..5f8d3871 100644 da = xr.DataArray( np.random.rand(4, 5), -@@ -518,6 +519,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using +@@ -524,6 +525,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using :py:meth:`DataArray.from_iris`: .. ipython:: python diff --git a/0003-DOC-Don-t-print-out-conda-pip-environment.patch b/0003-DOC-Don-t-print-out-conda-pip-environment.patch index 564a781..d8d308f 100644 --- a/0003-DOC-Don-t-print-out-conda-pip-environment.patch +++ b/0003-DOC-Don-t-print-out-conda-pip-environment.patch @@ -1,4 +1,4 @@ -From f8c3fe64bd1295b524f95ffbce6885a6a8418d09 Mon Sep 17 00:00:00 2001 +From cc094db443b53f96b32708676e515658ada8313f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 02:59:15 -0400 Subject: [PATCH 3/4] DOC: Don't print out conda/pip environment. @@ -9,18 +9,18 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 8 deletions(-) diff --git a/doc/conf.py b/doc/conf.py -index e83768ff..b5f1277b 100644 +index 74c3fd12..27a2f7b7 100644 --- a/doc/conf.py +++ b/doc/conf.py -@@ -14,7 +14,6 @@ - +@@ -15,7 +15,6 @@ import datetime import os + import pathlib -import subprocess import sys from contextlib import suppress -@@ -27,13 +26,6 @@ allowed_failures = set() +@@ -29,13 +28,6 @@ allowed_failures = set() print("python exec:", sys.executable) print("sys.path:", sys.path) diff --git a/0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch b/0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch index 6d36c51..9a74b51 100644 --- a/0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch +++ b/0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch @@ -1,4 +1,4 @@ -From abc0d5cbf2c25670e655e765046c9fbd112a546a Mon Sep 17 00:00:00 2001 +From 507bf6860cc59d7a1320e39b4138418874f7ca15 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 26 Sep 2020 23:10:31 -0400 Subject: [PATCH 4/4] Revert "un-xfail the pint assert_allclose and diff --git a/python-xarray.spec b/python-xarray.spec index cd2d899..c818dd9 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-%{srcname} -Version: 0.16.1 +Version: 0.16.2 Release: 1%{?dist} Summary: N-D labeled arrays and datasets in Python @@ -133,6 +133,9 @@ rm -rf xarray %changelog +* Sat Dec 12 2020 Elliott Sales de Andrade - 0.16.2-1 +- Update to latest version (#1902888) + * Sat Sep 26 2020 Elliott Sales de Andrade - 0.16.1-1 - Update to latest version (#1880864) diff --git a/sources b/sources index dafff46..3439f48 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (xarray-0.16.1.tar.gz) = b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321 +SHA512 (xarray-0.16.2.tar.gz) = f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8 SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29 SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd