From 9ed2fe88a3ee9fe3d11125a9730bd5116028fbfa Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 28 Nov 2021 01:05:24 -0500 Subject: [PATCH] Update to latest version (#2019529) --- .gitignore | 1 + ...on-t-download-RGB.byte.tif-during-build.patch | 10 +++++----- ...-examples-using-unpackaged-dependencies.patch | 6 +++--- ...C-Don-t-print-out-conda-pip-environment.patch | 6 +++--- python-xarray.spec | 16 ++++++++-------- sources | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 02c7844..4b5b807 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xarray-0.17.0.tar.gz /xarray-0.18.2.tar.gz /xarray-0.19.0.tar.gz +/xarray-0.20.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 a428025..db74d20 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 ae6e4b42276425bd74c358b21c6ca0d6cd19b902 Mon Sep 17 00:00:00 2001 +From 180fcfd02a1c4a01eef832d8695b4321c3671fe2 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:31:18 -0400 -Subject: [PATCH 1/5] 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 --- @@ -10,10 +10,10 @@ Signed-off-by: Elliott Sales de Andrade 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 8294e019..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 @@ -21,7 +21,7 @@ index 99eb1fd1..3d797296 100644 +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 --- a/doc/gallery/plot_rasterio_rgb.py diff --git a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch index 098350e..edcfd07 100644 --- a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch +++ b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch @@ -1,7 +1,7 @@ -From 22ee1f210910d8ab50cf45ff1b1ef54e30ff4dca Mon Sep 17 00:00:00 2001 +From 32bfc2b867c8c2cb88e78731ed23c754fd966e94 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 15 Mar 2019 22:48:25 -0400 -Subject: [PATCH 2/5] DOC: Skip examples using unpackaged dependencies. +Subject: [PATCH 2/3] DOC: Skip examples using unpackaged dependencies. Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ 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 8038beac..4b73d27f 100644 +index 16b87082..cd5540e5 100644 --- a/doc/user-guide/io.rst +++ b/doc/user-guide/io.rst @@ -510,6 +510,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using 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 6050c89..0e9a646 100644 --- a/0003-DOC-Don-t-print-out-conda-pip-environment.patch +++ b/0003-DOC-Don-t-print-out-conda-pip-environment.patch @@ -1,7 +1,7 @@ -From b515f4289c5c65b8c2f1dfd8039a7a326db2580f Mon Sep 17 00:00:00 2001 +From 024162543ace18922e4c65029843ec4f38909894 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 02:59:15 -0400 -Subject: [PATCH 3/5] 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 --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 8 deletions(-) diff --git a/doc/conf.py b/doc/conf.py -index 7e7c63ca..31a45020 100644 +index 93174c6a..637fc9b1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -15,7 +15,6 @@ diff --git a/python-xarray.spec b/python-xarray.spec index 4d59e75..71c2efe 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-%{srcname} -Version: 0.19.0 +Version: 0.20.1 Release: %autorelease Summary: N-D labeled arrays and datasets in Python @@ -22,16 +22,16 @@ Patch0003: 0003-DOC-Don-t-print-out-conda-pip-environment.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3dist(cftime) >= 1.1 -BuildRequires: python3dist(dask[array]) >= 2.15 -BuildRequires: python3dist(dask[dataframe]) >= 2.15 +BuildRequires: python3dist(cftime) >= 1.2 +BuildRequires: python3dist(dask[array]) >= 2.30 +BuildRequires: python3dist(dask[dataframe]) >= 2.30 BuildRequires: python3dist(netcdf4) >= 1.5 -BuildRequires: python3dist(pint) >= 0.15 +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(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 @@ -67,7 +67,7 @@ BuildRequires: natural-earth-map-data-110m BuildRequires: natural-earth-map-data-10m BuildRequires: python3-ipython-sphinx BuildRequires: python3dist(jupyter-client) -BuildRequires: python3dist(matplotlib) >= 3.2 +BuildRequires: python3dist(matplotlib) >= 3.3 BuildRequires: python3dist(sphinx) BuildRequires: python3dist(sphinx-gallery) BuildRequires: python3dist(sphinx-rtd-theme) diff --git a/sources b/sources index 228e168..485755e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (xarray-0.19.0.tar.gz) = 8f4ce7f770ea10e757112b722c7e7a56f19be2f885c63620d547cc54d8b625a5a23c5e603ba804c4d94f2a94863aad8351a9f6ef22ccbc1a78d77a549a21356e +SHA512 (xarray-0.20.1.tar.gz) = d2e6162286c7e7debed27f40082086dbb55467a953a2afa81b08313aa111c28ffa942785687ac57cb60241a1f45a5d9a937a10bcc7c3025860f7251bbac79c22 SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29 SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd