Update to latest version (#2060096)
This commit is contained in:
Elliott Sales de Andrade
@@ -15,3 +15,5 @@
|
||||
/xarray-0.20.2.tar.gz
|
||||
/xarray-0.21.0.tar.gz
|
||||
/xarray-0.21.1.tar.gz
|
||||
/xarray-2022.3.0.tar.gz
|
||||
/xarray-data-dbd07bb91a7112db0fd2f912c146999f9d436b0e.tar.gz
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e3ce7188110d2a765801bacf67f8e68b43772d25 Mon Sep 17 00:00:00 2001
|
||||
From f2d2a22fa88e02259851d6e7c6b4fada3d41d1e9 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.
|
||||
@@ -10,31 +10,31 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/doc/gallery/plot_rasterio.py b/doc/gallery/plot_rasterio.py
|
||||
index 8294e019..bc8b4421 100644
|
||||
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/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif"
|
||||
-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 758d4cd3..f2a7b2db 100644
|
||||
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/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif"
|
||||
-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.34.1
|
||||
2.35.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 37173adcc2c0aeafb2c9cd1e6976915d3cd8a177 Mon Sep 17 00:00:00 2001
|
||||
From 39f2c410dd18c551abc31ca9a36f7e052813616d 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.
|
||||
@@ -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 16b87082..cd5540e5 100644
|
||||
index ddde0bf5..b41c3554 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
|
||||
@@ -780,6 +780,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
|
||||
:py:meth:`DataArray.to_iris`:
|
||||
|
||||
.. ipython:: python
|
||||
@@ -20,7 +20,7 @@ index 16b87082..cd5540e5 100644
|
||||
|
||||
da = xr.DataArray(
|
||||
np.random.rand(4, 5),
|
||||
@@ -524,6 +525,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
|
||||
@@ -794,6 +795,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 16b87082..cd5540e5 100644
|
||||
da_cube = xr.DataArray.from_iris(cube)
|
||||
da_cube
|
||||
--
|
||||
2.34.1
|
||||
2.35.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From ab5a974ab067941660be8847baa3e65108694ee6 Mon Sep 17 00:00:00 2001
|
||||
From ae86c0b9849f714866203132a3928f1a9a3208d9 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.
|
||||
@@ -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 93174c6a..637fc9b1 100644
|
||||
index 8ce9efdc..4e2a1b14 100644
|
||||
--- a/doc/conf.py
|
||||
+++ b/doc/conf.py
|
||||
@@ -15,7 +15,6 @@
|
||||
@@ -24,9 +24,9 @@ index 93174c6a..637fc9b1 100644
|
||||
print("python exec:", sys.executable)
|
||||
print("sys.path:", sys.path)
|
||||
|
||||
-if "conda" in sys.executable:
|
||||
-if "CONDA_DEFAULT_ENV" in os.environ or "conda" in sys.executable:
|
||||
- print("conda environment:")
|
||||
- subprocess.run(["conda", "list"])
|
||||
- subprocess.run([os.environ.get("CONDA_EXE", "conda"), "list"])
|
||||
-else:
|
||||
- print("pip environment:")
|
||||
- subprocess.run([sys.executable, "-m", "pip", "list"])
|
||||
@@ -35,5 +35,5 @@ index 93174c6a..637fc9b1 100644
|
||||
|
||||
with suppress(ImportError):
|
||||
--
|
||||
2.34.1
|
||||
2.35.1
|
||||
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
%global srcname xarray
|
||||
%global data_commit 5fdb22b5613ba8176b9f6fa67be783d7810643eb
|
||||
%global data_commit dbd07bb91a7112db0fd2f912c146999f9d436b0e
|
||||
|
||||
%bcond_with docs
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 0.21.1
|
||||
Version: 2022.3.0
|
||||
Release: %autorelease
|
||||
Summary: N-D labeled arrays and datasets in Python
|
||||
|
||||
@@ -13,7 +13,7 @@ URL: https://github.com/pydata/xarray
|
||||
Source0: %pypi_source
|
||||
# Data for examples only.
|
||||
Source1: https://github.com/pydata/xarray-data/archive/%{data_commit}/xarray-data-%{data_commit}.tar.gz
|
||||
Source2: https://github.com/mapbox/rasterio/raw/1.2.10/tests/data/RGB.byte.tif
|
||||
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
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
SHA512 (xarray-0.21.1.tar.gz) = be5d925971557f492c8ca7e90eb678a0f98cf0a670eaa8a8564bd160a02fcd8a22362a8691c5447a9baaa67b464257f2ab6954747296839b304f3e25cf13487a
|
||||
SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29
|
||||
SHA512 (xarray-2022.3.0.tar.gz) = c088b985a852c57dcef14d8a5107987c0c33f17bde1d9d639d30ac826d906639ce0ee4fe8345c65a5479b944057af045fe50c2d2ea932356aceb0718f55cd24a
|
||||
SHA512 (xarray-data-dbd07bb91a7112db0fd2f912c146999f9d436b0e.tar.gz) = bf766113238e44ae274397ebb0f937797e265db70d9bfc9da148a3f736c99f08b0efc8214cb76c61f68b19a33e8c02017ed06295d0617af49836e0720b361808
|
||||
SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd
|
||||
|
||||
Reference in New Issue
Block a user