From 1106cd741ba45d9e1eada297eb77b1ad3421ad67 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 1 Aug 2022 02:29:35 -0400 Subject: [PATCH] Update to latest version (#2095334) --- .gitignore | 2 ++ ...-Don-t-download-RGB.byte.tif-during-build.patch | 4 ++-- ...ip-examples-using-unpackaged-dependencies.patch | 10 +++++----- ...DOC-Don-t-print-out-conda-pip-environment.patch | 14 +++++++------- python-xarray.spec | 9 +++++---- sources | 4 ++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index da29600..fcd849b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /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 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 ef03456..34209ce 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 f2d2a22fa88e02259851d6e7c6b4fada3d41d1e9 Mon Sep 17 00:00:00 2001 +From 338e50f33a7d286f592a64278349f380f108340c 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. @@ -36,5 +36,5 @@ index 912224ac..f2a7b2db 100644 # The data is in UTM projection. We have to set it manually until -- -2.35.1 +2.36.1 diff --git a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch index 190011f..0f6d1d3 100644 --- a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch +++ b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch @@ -1,4 +1,4 @@ -From 39f2c410dd18c551abc31ca9a36f7e052813616d Mon Sep 17 00:00:00 2001 +From 09bf051c792f195465c7330b57be204605b88d2c 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. @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 2 insertions(+) diff --git a/doc/user-guide/io.rst b/doc/user-guide/io.rst -index ddde0bf5..b41c3554 100644 +index beab5fc0..1109e578 100644 --- a/doc/user-guide/io.rst +++ b/doc/user-guide/io.rst -@@ -780,6 +780,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using +@@ -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 ddde0bf5..b41c3554 100644 da = xr.DataArray( np.random.rand(4, 5), -@@ -794,6 +795,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 ddde0bf5..b41c3554 100644 da_cube = xr.DataArray.from_iris(cube) da_cube -- -2.35.1 +2.36.1 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 e948476..19d74f4 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 ae86c0b9849f714866203132a3928f1a9a3208d9 Mon Sep 17 00:00:00 2001 +From a0c1d288ae09cbe8055b4531dffe285aa8b549b4 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. @@ -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 8ce9efdc..4e2a1b14 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 - -@@ -28,13 +27,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) @@ -35,5 +35,5 @@ index 8ce9efdc..4e2a1b14 100644 with suppress(ImportError): -- -2.35.1 +2.36.1 diff --git a/python-xarray.spec b/python-xarray.spec index 2621b38..fa2cc3a 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -1,16 +1,16 @@ %global srcname xarray -%global data_commit dbd07bb91a7112db0fd2f912c146999f9d436b0e +%global data_commit 86974d54ce83a130303fe8caa629e60deb3cb6e5 %bcond_with docs Name: python-%{srcname} -Version: 2022.3.0 +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/rasterio/rasterio/raw/1.2.10/tests/data/RGB.byte.tif @@ -22,6 +22,7 @@ Patch0003: 0003-DOC-Don-t-print-out-conda-pip-environment.patch BuildArch: noarch BuildRequires: python3-devel +BuildRequires: python3dist(bottleneck) BuildRequires: python3dist(cftime) >= 1.2 BuildRequires: python3dist(dask[array]) >= 2.30 BuildRequires: python3dist(dask[dataframe]) >= 2.30 @@ -122,7 +123,7 @@ pytest_args=( %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 +%doc README.md %if %{with docs} %files -n python-%{srcname}-doc diff --git a/sources b/sources index 3410e73..6d25708 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (xarray-2022.3.0.tar.gz) = c088b985a852c57dcef14d8a5107987c0c33f17bde1d9d639d30ac826d906639ce0ee4fe8345c65a5479b944057af045fe50c2d2ea932356aceb0718f55cd24a -SHA512 (xarray-data-dbd07bb91a7112db0fd2f912c146999f9d436b0e.tar.gz) = bf766113238e44ae274397ebb0f937797e265db70d9bfc9da148a3f736c99f08b0efc8214cb76c61f68b19a33e8c02017ed06295d0617af49836e0720b361808 +SHA512 (xarray-2022.6.0.tar.gz) = 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165 +SHA512 (xarray-data-86974d54ce83a130303fe8caa629e60deb3cb6e5.tar.gz) = c7cddd4de81908110f65fac9df63b68ade0d37b9983b2bf7a6d5021e419d5b7e23e6bee316be4f802a7fbd70952bb5e3eead91d544c8b8bd6ffb2747d3fca64f SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd