3 Commits
f28 ... f30

Author SHA1 Message Date
Elliott Sales de Andrade
3838454055 Disable doc build. 2019-07-22 00:40:13 -04:00
Elliott Sales de Andrade
e4e3bbeae9 Fix sources. 2019-07-21 22:15:39 -04:00
Elliott Sales de Andrade
d06712ba48 Update to latest version. 2019-07-21 17:29:03 -04:00
7 changed files with 40 additions and 98 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
/xarray-0.12.0.tar.gz
/xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz
/RGB.byte.tif
/xarray-0.12.3.tar.gz

View File

@@ -1,71 +1,40 @@
From fe8259c549993aac5909e756a4bfcd507a32c5d1 Mon Sep 17 00:00:00 2001
From 63fc5acba81601e473ead5c4e82de78b5ae61ad0 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/4] 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 | 7 -------
doc/gallery/plot_rasterio_rgb.py | 7 -------
2 files changed, 14 deletions(-)
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 98801990..cfddb2a0 100644
index 82d5ce61..24502f10 100644
--- a/doc/gallery/plot_rasterio.py
+++ b/doc/gallery/plot_rasterio.py
@@ -17,7 +17,6 @@ original map projection (see :ref:`recipes.rasterio_rgb`).
"""
import os
-import urllib.request
import cartopy.crs as ccrs
import matplotlib.pyplot as plt
@@ -26,9 +25,6 @@ from rasterio.warp import transform
@@ -24,7 +24,7 @@ from rasterio.warp import transform
import xarray as xr
-# Download the file from rasterio's repository
-url = 'https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif'
-urllib.request.urlretrieve(url, 'RGB.byte.tif')
# Read the data
da = xr.open_rasterio('RGB.byte.tif')
@@ -54,6 +50,3 @@ greyscale.plot(ax=ax, x='lon', y='lat', transform=ccrs.PlateCarree(),
cmap='Greys_r', add_colorbar=False)
ax.coastlines('10m', color='r')
plt.show()
-
-# Delete the file
-os.remove('RGB.byte.tif')
-url = 'https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif'
+url = 'RGB.byte.tif'
da = xr.open_rasterio(url)
# Compute the lon/lat coordinates with rasterio.warp.transform
diff --git a/doc/gallery/plot_rasterio_rgb.py b/doc/gallery/plot_rasterio_rgb.py
index 2733bf14..e842758e 100644
index 23a56d5a..468e2bab 100644
--- a/doc/gallery/plot_rasterio_rgb.py
+++ b/doc/gallery/plot_rasterio_rgb.py
@@ -14,16 +14,12 @@ transformation.
"""
import os
-import urllib.request
import cartopy.crs as ccrs
import matplotlib.pyplot as plt
@@ -19,7 +19,7 @@ import matplotlib.pyplot as plt
import xarray as xr
-# Download the file from rasterio's repository
-url = 'https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif'
-urllib.request.urlretrieve(url, 'RGB.byte.tif')
# Read the data
da = xr.open_rasterio('RGB.byte.tif')
@@ -37,6 +33,3 @@ ax = plt.subplot(projection=crs)
da.plot.imshow(ax=ax, rgb='band', transform=crs)
ax.coastlines('10m', color='r')
plt.show()
-
-# Delete the file
-os.remove('RGB.byte.tif')
-url = 'https://github.com/mapbox/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.20.1
2.21.0

View File

@@ -1,4 +1,4 @@
From 2eb33a619724bed0c324e3723d3f0eedf82806a1 Mon Sep 17 00:00:00 2001
From 90f116ffbf6eb403d4ddd44e6b9bafddced99419 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/4] 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/io.rst b/doc/io.rst
index 51c74718..64aa4d88 100644
index 85cb73a0..60990627 100644
--- a/doc/io.rst
+++ b/doc/io.rst
@@ -366,6 +366,7 @@ installed xarray can convert a ``DataArray`` into a ``Cube`` using
@@ -373,6 +373,7 @@ installed xarray can convert a ``DataArray`` into a ``Cube`` using
:py:meth:`~xarray.DataArray.to_iris`:
.. ipython:: python
@@ -20,7 +20,7 @@ index 51c74718..64aa4d88 100644
da = xr.DataArray(np.random.rand(4, 5), dims=['x', 'y'],
coords=dict(x=[10, 20, 30, 40],
@@ -378,6 +379,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
@@ -385,6 +386,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
:py:meth:`~xarray.DataArray.from_iris`:
.. ipython:: python
@@ -29,5 +29,5 @@ index 51c74718..64aa4d88 100644
da_cube = xr.DataArray.from_iris(cube)
da_cube
--
2.20.1
2.21.0

View File

@@ -1,4 +1,4 @@
From 31da0ae60854e4678468a161217548c0daa7af59 Mon Sep 17 00:00:00 2001
From 2b193b193b422b322a5f5e6475ce72d9a453fb9f Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 16 Mar 2019 02:42:37 -0400
Subject: [PATCH 3/4] TST: Reduce required pytest-runner version.
@@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 3921d0c3..60beae90 100644
index f24392db..af5190f3 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ CLASSIFIERS = [
@@ -19,8 +19,8 @@ index 3921d0c3..60beae90 100644
-SETUP_REQUIRES = ['pytest-runner >= 4.2'] if needs_pytest else []
+SETUP_REQUIRES = ['pytest-runner >= 4.0'] if needs_pytest else []
TESTS_REQUIRE = ['pytest >= 2.7.1']
if sys.version_info[0] < 3:
TESTS_REQUIRE.append('mock')
DESCRIPTION = "N-D labeled arrays and datasets in Python"
--
2.20.1
2.21.0

View File

@@ -1,4 +1,4 @@
From f35372127084836ec4b9871f809a688c465f4ee2 Mon Sep 17 00:00:00 2001
From 46ca88294c55170c442417f7341571079f1bc2a9 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 4/4] 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, 7 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index 32274155..e6071cdd 100644
index 23766946..33bfcf9d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -26,13 +26,6 @@ allowed_failures = set()
@@ -27,5 +27,5 @@ index 32274155..e6071cdd 100644
with suppress(ImportError):
--
2.20.1
2.21.0

View File

@@ -2,7 +2,7 @@
%global data_commit 870b5d7a9dbfa821423f1b88056890c22341f085
Name: python-%{srcname}
Version: 0.12.0
Version: 0.12.3
Release: 1%{?dist}
Summary: N-D labeled arrays and datasets in Python
@@ -24,7 +24,6 @@ BuildRequires: python3-devel
BuildRequires: python3-dask+array
BuildRequires: python3-dask+dataframe
BuildRequires: python3dist(numpy) >= 1.12
BuildRequires: python3dist(numpydoc)
BuildRequires: python3dist(pandas) >= 0.19.2
BuildRequires: python3dist(pytest) >= 2.7.1
BuildRequires: python3dist(pytest-runner)
@@ -58,25 +57,6 @@ Summary: %{summary}
%description -n python3-%{srcname} %{_description}
%package -n python-%{srcname}-doc
Summary: xarray documentation
BuildRequires: python3dist(cartopy)
BuildRequires: natural-earth-map-data-110m
BuildRequires: natural-earth-map-data-10m
BuildRequires: python3-ipython-sphinx
BuildRequires: python3dist(matplotlib)
BuildRequires: python3dist(netcdf4)
BuildRequires: python3dist(rasterio)
BuildRequires: python3dist(sphinx)
BuildRequires: python3dist(sphinx-gallery)
BuildRequires: python3dist(sphinx-rtd-theme)
BuildRequires: python3dist(zarr)
%description -n python-%{srcname}-doc
Documentation for xarray
%prep
%autosetup -n %{srcname}-%{version} -p1
@@ -91,33 +71,25 @@ rm -rf %{srcname}.egg-info
%build
%py3_build
# generate html docs
pushd doc
PYTHONPATH=${PWD}/.. HOME=${PWD}/../%{srcname}-data-%{data_commit} make html
# remove the sphinx-build leftovers
rm -rf _build/html/.{doctrees,buildinfo}
popd
%install
%py3_install
%check
%{__python3} setup.py test --addopts='-ra -n auto'
%{__python3} setup.py test --addopts='-ra -n auto -m "not network"'
%files -n python3-%{srcname}
%license LICENSE
%license LICENSE licenses/DASK_LICENSE licenses/NUMPY_LICENSE licenses/PANDAS_LICENSE licenses/PYTHON_LICENSE licenses/SEABORN_LICENSE
%doc README.rst
%{python3_sitelib}/%{srcname}
%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info
%files -n python-%{srcname}-doc
%doc doc/_build/html
%license LICENSE
%changelog
* Sun Jul 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.3-1
- Update to latest version
* Sat Mar 16 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.0-1
- Initial package.

View File

@@ -1,3 +1,3 @@
SHA512 (xarray-0.12.0.tar.gz) = 7e8f71cdf68f5f8c18d9311490121a9a76ad49ccd8345960214e323ebe0588e82d041eb579d83d52592147ac3629a0611b61b1ac7d0c7d320651fe658967140e
SHA512 (xarray-0.12.3.tar.gz) = bac585362920f22b128ea75d5434ff1e9494cc4b8bafbb11533e80f3e09fe18e580e3e0dd9696bd906ac552ce5eb134e92019f6d2a7b1af0d38d27ac6589a846
SHA512 (xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz) = 27de6e274d18d266d6d8a1f0c8f65396fff16d177cf6df41cfd4bcf839e6d083512c4f4dbc1163ab7380a8905acecfe15b7978e23b9c360bad2dd879addb421c
SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd