Update to latest version (#2131120)

This commit is contained in:
Elliott Sales de Andrade
2023-05-08 03:02:23 -04:00
parent 099f6f89e8
commit ea961bf619
6 changed files with 18 additions and 60 deletions
+2
View File
@@ -20,3 +20,5 @@
/xarray-2022.6.0.tar.gz
/xarray-data-86974d54ce83a130303fe8caa629e60deb3cb6e5.tar.gz
/xarray-2023.1.0.tar.gz
/xarray-2023.4.2.tar.gz
/xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz
@@ -1,40 +0,0 @@
From 338e50f33a7d286f592a64278349f380f108340c 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/3] DOC: Don't download RGB.byte.tif during build.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
doc/gallery/plot_rasterio.py | 2 +-
doc/gallery/plot_rasterio_rgb.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/gallery/plot_rasterio.py b/doc/gallery/plot_rasterio.py
index 853923a3..bc8b4421 100644
--- a/doc/gallery/plot_rasterio.py
+++ b/doc/gallery/plot_rasterio.py
@@ -23,7 +23,7 @@ from pyproj import Transformer
import xarray as xr
# Read the data
-url = "https://github.com/rasterio/rasterio/raw/master/tests/data/RGB.byte.tif"
+url = "RGB.byte.tif"
da = xr.open_rasterio(url)
# Compute the lon/lat coordinates with pyproj
diff --git a/doc/gallery/plot_rasterio_rgb.py b/doc/gallery/plot_rasterio_rgb.py
index 912224ac..f2a7b2db 100644
--- a/doc/gallery/plot_rasterio_rgb.py
+++ b/doc/gallery/plot_rasterio_rgb.py
@@ -18,7 +18,7 @@ import matplotlib.pyplot as plt
import xarray as xr
# Read the data
-url = "https://github.com/rasterio/rasterio/raw/master/tests/data/RGB.byte.tif"
+url = "RGB.byte.tif"
da = xr.open_rasterio(url)
# The data is in UTM projection. We have to set it manually until
--
2.36.1
@@ -1,7 +1,7 @@
From 09bf051c792f195465c7330b57be204605b88d2c Mon Sep 17 00:00:00 2001
From f2b1952202db32b956566648dec4cfd302f54316 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/3] DOC: Skip examples using unpackaged dependencies.
Subject: [PATCH 1/2] DOC: Skip examples using unpackaged dependencies.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/doc/user-guide/io.rst b/doc/user-guide/io.rst
index beab5fc0..1109e578 100644
index dc495b9f..e03080a1 100644
--- a/doc/user-guide/io.rst
+++ b/doc/user-guide/io.rst
@@ -857,6 +857,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
@@ -921,6 +921,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
:py:meth:`DataArray.to_iris`:
.. ipython:: python
@@ -20,7 +20,7 @@ index beab5fc0..1109e578 100644
da = xr.DataArray(
np.random.rand(4, 5),
@@ -871,6 +872,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
@@ -935,6 +936,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 beab5fc0..1109e578 100644
da_cube = xr.DataArray.from_iris(cube)
da_cube
--
2.36.1
2.39.2
@@ -1,7 +1,7 @@
From a0c1d288ae09cbe8055b4531dffe285aa8b549b4 Mon Sep 17 00:00:00 2001
From f85d7fd7257f3c109987022e35f81da24a32bdbf 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/3] DOC: Don't print out conda/pip environment.
Subject: [PATCH 2/2] DOC: Don't print out conda/pip environment.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@@ -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 7e28953b..49bfdaca 100644
index eb861004..faed9753 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -16,7 +16,6 @@ import datetime
@@ -35,5 +35,5 @@ index 7e28953b..49bfdaca 100644
with suppress(ImportError):
--
2.36.1
2.39.2
+4 -7
View File
@@ -1,10 +1,10 @@
%global srcname xarray
%global data_commit 86974d54ce83a130303fe8caa629e60deb3cb6e5
%global data_commit 7d8290e0be9d2a8f4b4381641f20a97db6eaea3d
%bcond_with docs
Name: python-%{srcname}
Version: 2023.1.0
Version: 2023.4.2
Release: %autorelease
Summary: N-D labeled arrays and datasets in Python
@@ -13,11 +13,9 @@ URL: https://github.com/pydata/xarray
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
# All Fedora specific.
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
Patch0001: 0001-DOC-Skip-examples-using-unpackaged-dependencies.patch
Patch0002: 0002-DOC-Don-t-print-out-conda-pip-environment.patch
BuildArch: noarch
@@ -84,7 +82,6 @@ Documentation for xarray
%if %{with docs}
# Provide example datasets for building docs.
tar xf %SOURCE1 --transform='s~^\(%{srcname}-data-%{data_commit}/\)~\1.xarray_tutorial_data/~'
cp -p %SOURCE2 ./doc/gallery/
%endif
+2 -3
View File
@@ -1,3 +1,2 @@
SHA512 (xarray-2023.1.0.tar.gz) = baddac6ed08816eb06b8153bc3443cc4ae77fc1d17d2cf242f543ce75b37e390f5c7e8c59cc292d1a586a78245cac614cf656a202f8d5ca81c176c4834533c4b
SHA512 (xarray-data-86974d54ce83a130303fe8caa629e60deb3cb6e5.tar.gz) = c7cddd4de81908110f65fac9df63b68ade0d37b9983b2bf7a6d5021e419d5b7e23e6bee316be4f802a7fbd70952bb5e3eead91d544c8b8bd6ffb2747d3fca64f
SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd
SHA512 (xarray-2023.4.2.tar.gz) = 581b06a677b80c0f7e494a80ae52d75bd62bf613b13b7b7215458ceef727fb55a898c8da8cc6f8a6875ef6898007897eea8be55fb138f1dacad42965bbf1d956
SHA512 (xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz) = 3734ad5649b9ba23e8fe52ac1fc34694dcb3c761a1817e520726a83d31e725e2448aa0109ad7ad385572ae7d6a285bf1407d104f87227127a6a51d73b797a952