From facfa49251e30b318fbff8a417b36a410869ae37 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 26 Sep 2020 23:53:57 -0400 Subject: [PATCH] Update to latest version. --- .gitignore | 1 + ...t-download-RGB.byte.tif-during-build.patch | 6 +-- ...amples-using-unpackaged-dependencies.patch | 6 +-- ...on-t-print-out-conda-pip-environment.patch | 24 ++++++---- ...the-pint-assert_allclose-and-assert_.patch | 48 +++++++++++++++++++ python-xarray.spec | 9 +++- sources | 2 +- 7 files changed, 79 insertions(+), 17 deletions(-) create mode 100644 0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch diff --git a/.gitignore b/.gitignore index bfc0895..63257d4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xarray-0.15.1.tar.gz /xarray-0.16.0.tar.gz /xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz +/xarray-0.16.1.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 95e0d7a..88f3be2 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,7 +1,7 @@ -From 361e61a825fb2f7e42e5428bca1b338ec061ff0f Mon Sep 17 00:00:00 2001 +From 6e8b1e5bd01319a847263109597f153f7f8322b2 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:31:18 -0400 -Subject: [PATCH 1/3] DOC: Don't download RGB.byte.tif during build. +Subject: [PATCH 1/4] DOC: Don't download RGB.byte.tif during build. Signed-off-by: Elliott Sales de Andrade --- @@ -36,5 +36,5 @@ index 758d4cd3..f2a7b2db 100644 # The data is in UTM projection. We have to set it manually until -- -2.25.4 +2.26.2 diff --git a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch index 381ffc9..6ef7179 100644 --- a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch +++ b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch @@ -1,7 +1,7 @@ -From 909193458554ebf2f0fb42a7beb550a20ad27735 Mon Sep 17 00:00:00 2001 +From 42e1c13758d01b83d30d6a6647e85ab6cf9560b5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:48:25 -0400 -Subject: [PATCH 2/3] DOC: Skip examples using unpackaged dependencies. +Subject: [PATCH 2/4] DOC: Skip examples using unpackaged dependencies. Signed-off-by: Elliott Sales de Andrade --- @@ -29,5 +29,5 @@ index 4aac5e0b..5f8d3871 100644 da_cube = xr.DataArray.from_iris(cube) da_cube -- -2.25.4 +2.26.2 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 11691fc..564a781 100644 --- a/0003-DOC-Don-t-print-out-conda-pip-environment.patch +++ b/0003-DOC-Don-t-print-out-conda-pip-environment.patch @@ -1,18 +1,26 @@ -From e5a4bf1b7bc0ef02d586ec857e09f67fc1a47340 Mon Sep 17 00:00:00 2001 +From f8c3fe64bd1295b524f95ffbce6885a6a8418d09 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 02:59:15 -0400 -Subject: [PATCH 3/3] DOC: Don't print out conda/pip environment. +Subject: [PATCH 3/4] DOC: Don't print out conda/pip environment. Signed-off-by: Elliott Sales de Andrade --- - doc/conf.py | 7 ------- - 1 file changed, 7 deletions(-) + doc/conf.py | 8 -------- + 1 file changed, 8 deletions(-) diff --git a/doc/conf.py b/doc/conf.py -index d3d126cb..8dfed5e8 100644 +index e83768ff..b5f1277b 100644 --- a/doc/conf.py +++ b/doc/conf.py -@@ -38,13 +38,6 @@ allowed_failures = set() +@@ -14,7 +14,6 @@ + + import datetime + import os +-import subprocess + import sys + from contextlib import suppress + +@@ -27,13 +26,6 @@ allowed_failures = set() print("python exec:", sys.executable) print("sys.path:", sys.path) @@ -23,9 +31,9 @@ index d3d126cb..8dfed5e8 100644 - print("pip environment:") - subprocess.run(["pip", "list"]) - - print("xarray: %s, %s" % (xarray.__version__, xarray.__file__)) + print(f"xarray: {xarray.__version__}, {xarray.__file__}") with suppress(ImportError): -- -2.25.4 +2.26.2 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 new file mode 100644 index 0000000..6d36c51 --- /dev/null +++ b/0004-Revert-un-xfail-the-pint-assert_allclose-and-assert_.patch @@ -0,0 +1,48 @@ +From abc0d5cbf2c25670e655e765046c9fbd112a546a 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 + assert_duckarray_equal tests" + +This reverts commit e045bd3e1dcbeedd31205d8ceb4186e28edc6cc2. + +Signed-off-by: Elliott Sales de Andrade +--- + 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 + diff --git a/python-xarray.spec b/python-xarray.spec index 73cbd93..cd2d899 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -4,8 +4,8 @@ %bcond_with docs Name: python-%{srcname} -Version: 0.16.0 -Release: 2%{?dist} +Version: 0.16.1 +Release: 1%{?dist} Summary: N-D labeled arrays and datasets in Python License: ASL 2.0 @@ -18,6 +18,8 @@ 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 BuildArch: noarch @@ -131,6 +133,9 @@ rm -rf xarray %changelog +* Sat Sep 26 2020 Elliott Sales de Andrade - 0.16.1-1 +- Update to latest version (#1880864) + * Wed Jul 29 2020 Fedora Release Engineering - 0.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 39e6e2d..dafff46 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (xarray-0.16.0.tar.gz) = 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc +SHA512 (xarray-0.16.1.tar.gz) = b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321 SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29 SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd