Disable doc build.

2019-07-22 00:40:13 -04:00
9 changed files with 94 additions and 223 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,3 @@
 /xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz
 /RGB.byte.tif
 /xarray-0.12.3.tar.gz
-/xarray-0.15.0.tar.gz
-/xarray-0.15.1.tar.gz
-/xarray-0.16.0.tar.gz
-/xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz
-/xarray-0.16.1.tar.gz
-/xarray-0.16.2.tar.gz
-/xarray-0.17.0.tar.gz
--- 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 d1bff712ac7f0d65d943c77de7008fd192eae919 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.
@@ -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 99eb1fd1..3d797296 100644
+index 82d5ce61..24502f10 100644
 --- a/doc/gallery/plot_rasterio.py
 +++ b/doc/gallery/plot_rasterio.py
-@@ -23,7 +23,7 @@ from rasterio.warp import transform
+@@ -24,7 +24,7 @@ from rasterio.warp import transform
 import xarray as xr
 
 # Read the data
-url = "https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif"
-+url = "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 758d4cd3..f2a7b2db 100644
+index 23a56d5a..468e2bab 100644
 --- a/doc/gallery/plot_rasterio_rgb.py
 +++ b/doc/gallery/plot_rasterio_rgb.py
-@@ -18,7 +18,7 @@ import matplotlib.pyplot as plt
+@@ -19,7 +19,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 = "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.29.2
+2.21.0

--- a/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch
+++ b/0002-DOC-Skip-examples-using-unpackaged-dependencies.patch
@@ -1,4 +1,4 @@
-From 98140b3ff72134777959896d128e5049c182eaa7 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,19 +9,19 @@ 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 c2022cc9..fb9cba9c 100644
+index 85cb73a0..60990627 100644
 --- a/doc/io.rst
 +++ b/doc/io.rst
-@@ -510,6 +510,7 @@ installed, xarray can convert a ``DataArray`` into a ``Cube`` using
- :py:meth:`DataArray.to_iris`:
+@@ -373,6 +373,7 @@ installed xarray can convert a ``DataArray`` into a ``Cube`` using
+ :py:meth:`~xarray.DataArray.to_iris`:
 
 .. ipython:: python
 +    :verbatim:
 
-     da = xr.DataArray(
-         np.random.rand(4, 5),
-@@ -524,6 +525,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
- :py:meth:`DataArray.from_iris`:
+     da = xr.DataArray(np.random.rand(4, 5), dims=['x', 'y'],
+                       coords=dict(x=[10, 20, 30, 40],
+@@ -385,6 +386,7 @@ Conversely, we can create a new ``DataArray`` object from a ``Cube`` using
+ :py:meth:`~xarray.DataArray.from_iris`:
 
 .. ipython:: python
 +    :verbatim:
@@ -29,5 +29,5 @@ index c2022cc9..fb9cba9c 100644
     da_cube = xr.DataArray.from_iris(cube)
     da_cube
 -- 
-2.29.2
+2.21.0

--- a/0003-DOC-Don-t-print-out-conda-pip-environment.patch
+++ b/0003-DOC-Don-t-print-out-conda-pip-environment.patch
@@ -1,39 +0,0 @@
-From 16fd494e4f98eb702838ae980f20c2303241f19c 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/4] DOC: Don't print out conda/pip environment.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- doc/conf.py | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/doc/conf.py b/doc/conf.py
-index db7229cf..b15e8073 100644
--- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -15,7 +15,6 @@
- import datetime
- import os
- import pathlib
-import subprocess
- import sys
- from contextlib import suppress
- 
-@@ -29,13 +28,6 @@ allowed_failures = set()
- print("python exec:", sys.executable)
- print("sys.path:", sys.path)
- 
-if "conda" in sys.executable:
-    print("conda environment:")
-    subprocess.run(["conda", "list"])
-else:
-    print("pip environment:")
-    subprocess.run([sys.executable, "-m", "pip", "list"])
-
- print(f"xarray: {xarray.__version__}, {xarray.__file__}")
- 
- with suppress(ImportError):
-- 
-2.29.2
-
--- a/0003-TST-Reduce-required-pytest-runner-version.patch
+++ b/0003-TST-Reduce-required-pytest-runner-version.patch
@@ -0,0 +1,26 @@
+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.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index f24392db..af5190f3 100644
+--- a/setup.py
+++ b/setup.py
+@@ -25,7 +25,7 @@ CLASSIFIERS = [
+ PYTHON_REQUIRES = '>=3.5'
+ INSTALL_REQUIRES = ['numpy >= 1.12', 'pandas >= 0.19.2']
+ needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+-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']
+ 
+ DESCRIPTION = "N-D labeled arrays and datasets in Python"
+-- 
+2.21.0
+
--- a/0004-DOC-Don-t-print-out-conda-pip-environment.patch
+++ b/0004-DOC-Don-t-print-out-conda-pip-environment.patch
@@ -0,0 +1,31 @@
+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.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ doc/conf.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 23766946..33bfcf9d 100644
+--- a/doc/conf.py
+++ b/doc/conf.py
+@@ -26,13 +26,6 @@ allowed_failures = set()
+ print("python exec:", sys.executable)
+ print("sys.path:", sys.path)
+ 
+-if 'conda' in sys.executable:
+-    print('conda environment:')
+-    subprocess.run(['conda', 'list'])
+-else:
+-    print('pip environment:')
+-    subprocess.run(['pip', 'list'])
+-
+ print("xarray: %s, %s" % (xarray.__version__, xarray.__file__))
+ 
+ with suppress(ImportError):
+-- 
+2.21.0
+
--- a/4256.patch
+++ b/4256.patch
@@ -1,51 +0,0 @@
-From 9d1c3cb5d7fba68c0dc675dd80825cac8b644e01 Mon Sep 17 00:00:00 2001
-From: Keewis <keewis@posteo.de>
-Date: Sat, 6 Mar 2021 23:16:57 +0100
-Subject: [PATCH 1/3] duplicate the level if a single level was passed
-
---
- xarray/plot/utils.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
-index 5510cf7f21..57cdf9f45d 100644
--- a/xarray/plot/utils.py
-+++ b/xarray/plot/utils.py
-@@ -60,6 +60,11 @@ def _build_discrete_cmap(cmap, levels, extend, filled):
-     """
-     import matplotlib as mpl
- 
-+    if isinstance(levels, (int, float)):
-+        levels = [levels, levels]
-+    elif len(levels) == 1:
-+        levels = [levels[0], levels[0]]
-+
-     if not filled:
-         # non-filled contour plots
-         extend = "max"
-
-From 7977ce0fa25971abc50a5dd010d15d71f8013a84 Mon Sep 17 00:00:00 2001
-From: Keewis <keewis@posteo.de>
-Date: Sat, 6 Mar 2021 23:29:39 +0100
-Subject: [PATCH 2/3] don't handle scalars
-
-it seems these will never be passed at that level
---
- xarray/plot/utils.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
-index 57cdf9f45d..a83bc28e27 100644
--- a/xarray/plot/utils.py
-+++ b/xarray/plot/utils.py
-@@ -60,9 +60,7 @@ def _build_discrete_cmap(cmap, levels, extend, filled):
-     """
-     import matplotlib as mpl
- 
-    if isinstance(levels, (int, float)):
-        levels = [levels, levels]
-    elif len(levels) == 1:
-+    if len(levels) == 1:
-         levels = [levels[0], levels[0]]
- 
-     if not filled:
--- a/python-xarray.spec
+++ b/python-xarray.spec
@@ -1,10 +1,8 @@
 %global srcname xarray
-%global data_commit 5fdb22b5613ba8176b9f6fa67be783d7810643eb
-
-%bcond_with docs
+%global data_commit 870b5d7a9dbfa821423f1b88056890c22341f085

 Name:           python-%{srcname}
-Version:        0.17.0
+Version:        0.12.3
 Release:        1%{?dist}
 Summary:        N-D labeled arrays and datasets in Python

@@ -17,27 +15,21 @@ Source2:        https://github.com/mapbox/rasterio/raw/1.0.21/tests/data/RGB.byt
 # 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
-# Fix tests with Matplotlib 3.4.
-Patch0004:      https://github.com/pydata/xarray/pull/4256.patch
+Patch0003:      0003-TST-Reduce-required-pytest-runner-version.patch
+Patch0004:      0004-DOC-Don-t-print-out-conda-pip-environment.patch

 BuildArch:      noarch

 BuildRequires:  python3-devel
-BuildRequires:  python3dist(cftime) >= 1
-BuildRequires:  python3-dask+array >= 2.11
-BuildRequires:  python3-dask+dataframe >= 2.11
-BuildRequires:  python3dist(netcdf4) >= 1.5
-BuildRequires:  python3dist(numpy) >= 1.17
-BuildRequires:  python3dist(pandas) >= 1
-BuildRequires:  python3dist(pint)
+BuildRequires:  python3-dask+array
+BuildRequires:  python3-dask+dataframe
+BuildRequires:  python3dist(numpy) >= 1.12
+BuildRequires:  python3dist(pandas) >= 0.19.2
 BuildRequires:  python3dist(pytest) >= 2.7.1
+BuildRequires:  python3dist(pytest-runner)
 BuildRequires:  python3dist(pytest-xdist)
-BuildRequires:  python3dist(rasterio) >= 1.1
-BuildRequires:  python3dist(seaborn) >= 0.10
-BuildRequires:  python3dist(setuptools) >= 41.2
-BuildRequires:  python3dist(setuptools-scm)
-BuildRequires:  python3dist(zarr) >= 2.4
+BuildRequires:  python3dist(seaborn)
+BuildRequires:  python3dist(setuptools)

 %global _description %{expand: \
 Xarray (formerly xray) is an open source project and Python package that
@@ -65,118 +57,37 @@ Summary:        %{summary}
 %description -n python3-%{srcname} %{_description}


-%if %{with docs}
-%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(jupyter-client)
-BuildRequires:  python3dist(matplotlib)
-BuildRequires:  python3dist(sphinx)
-BuildRequires:  python3dist(sphinx-gallery)
-BuildRequires:  python3dist(sphinx-rtd-theme)
-
-%description -n python-%{srcname}-doc
-Documentation for xarray
-%endif
-
-
 %prep
 %autosetup -n %{srcname}-%{version} -p1

-%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
+
+# Remove bundled egg-info
+rm -rf %{srcname}.egg-info


 %build
 %py3_build

-%if %{with docs}
-# 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
-%endif
-

 %install
 %py3_install


 %check
-rm -rf xarray
-%{pytest} -ra -n auto -m "not network" --pyargs xarray
+%{__python3} setup.py test --addopts='-ra -n auto -m "not network"'


 %files -n python3-%{srcname}
 %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
-
-%if %{with docs}
-%files -n python-%{srcname}-doc
-%doc doc/_build/html
-%license LICENSE licenses/DASK_LICENSE licenses/NUMPY_LICENSE licenses/PANDAS_LICENSE licenses/PYTHON_LICENSE licenses/SEABORN_LICENSE
-%endif
+%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info


 %changelog
-* Sat Mar 13 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.17.0-1
- Update to latest version (#1933230)
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Dec 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.16.2-1
- Update to latest version (#1902888)
-
-* Sat Sep 26 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.16.1-1
- Update to latest version (#1880864)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jul 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.16.0-1
- Update to latest version
-
-* Tue Jun 23 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-3
- Backport patch to fix tests catching too many warnings
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.15.1-3
- Rebuilt for Python 3.9
-
-* Sat Apr 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-2
- Fix broken install with missing files
- Test against installed version to catch above issue
- Add more test dependencies
-
-* Wed Mar 25 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.1-1
- Update to latest version
-
-* Fri Mar 06 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.0-2
- Backport fix for seaborn 0.10.0
-
-* Sat Feb 08 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.15.0-1
- Update to latest version
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.3-3
- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Sun Jul 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.12.3-1
 - Update to latest version

--- a/4
+++ b/4
@@ -1,3 +1,3 @@
-SHA512 (xarray-0.17.0.tar.gz) = 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
-SHA512 (xarray-data-5fdb22b5613ba8176b9f6fa67be783d7810643eb.tar.gz) = a1ed7c14e9fe6a0e4327b374b1b0ecd93472cd8308b3e2bbc078172576b8f31cd27c11da4b1c557e9b1615a411beaf21db83de755ece342343a4db2773ce6d29
+SHA512 (xarray-0.12.3.tar.gz) = bac585362920f22b128ea75d5434ff1e9494cc4b8bafbb11533e80f3e09fe18e580e3e0dd9696bd906ac552ce5eb134e92019f6d2a7b1af0d38d27ac6589a846
+SHA512 (xarray-data-870b5d7a9dbfa821423f1b88056890c22341f085.tar.gz) = 27de6e274d18d266d6d8a1f0c8f65396fff16d177cf6df41cfd4bcf839e6d083512c4f4dbc1163ab7380a8905acecfe15b7978e23b9c360bad2dd879addb421c
 SHA512 (RGB.byte.tif) = 34aa1b196f6c5880530d42ec8a25193bc79db803a8427adc9b115373d222b9f4318a04f06c8b37118df7e09d96b9c470ecec543c604af18861f11b786ed6fbfd