From 4a8ca0c05db0cf8b128fc9912ef3f63b6bf3543d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 18 Aug 2024 23:41:45 -0400 Subject: [PATCH] Update to latest version (#2245099) --- .gitignore | 1 + 8186.patch | 29 ----------------------------- python-xarray.spec | 6 +++--- sources | 2 +- 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 8186.patch diff --git a/.gitignore b/.gitignore index 82a959b..00035b2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /xarray-2023.8.0.tar.gz /xarray-2023.9.0.tar.gz /xarray-2024.6.0.tar.gz +/xarray-2024.7.0.tar.gz diff --git a/8186.patch b/8186.patch deleted file mode 100644 index c141ce9..0000000 --- a/8186.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c7391fca66e1fd24b175cfffab692af20628fe2b Mon Sep 17 00:00:00 2001 -From: Kyle Sunden -Date: Thu, 14 Sep 2023 20:18:04 -0500 -Subject: [PATCH] Update contourf call check for mpl 3.8 - ---- - xarray/tests/test_plot.py | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/xarray/tests/test_plot.py b/xarray/tests/test_plot.py -index 8b2dfbdec4..a6c15a8600 100644 ---- a/xarray/tests/test_plot.py -+++ b/xarray/tests/test_plot.py -@@ -167,7 +167,14 @@ def imshow_called(self, plotmethod): - - def contourf_called(self, plotmethod): - plotmethod() -- paths = plt.gca().findobj(mpl.collections.PathCollection) -+ -+ # Compatible with mpl before (PathCollection) and after (QuadContourSet) 3.8 -+ def matchfunc(x): -+ return isinstance( -+ x, (mpl.collections.PathCollection, mpl.contour.QuadContourSet) -+ ) -+ -+ paths = plt.gca().findobj(matchfunc) - return len(paths) > 0 - - diff --git a/python-xarray.spec b/python-xarray.spec index 8f65873..b900f09 100644 --- a/python-xarray.spec +++ b/python-xarray.spec @@ -1,10 +1,10 @@ %global srcname xarray %global data_commit 7d8290e0be9d2a8f4b4381641f20a97db6eaea3d -%bcond_with docs +%bcond docs 0 Name: python-%{srcname} -Version: 2024.6.0 +Version: 2024.7.0 Release: %autorelease Summary: N-D labeled arrays and datasets in Python @@ -95,7 +95,7 @@ tar xf %SOURCE1 --transform='s~^\(%{srcname}-data-%{data_commit}/\)~\1.xarray_tu %if %{with docs} # generate html docs pushd doc -PYTHONPATH=${PWD}/.. HOME=${PWD}/../%{srcname}-data-%{data_commit} make html +PYTHONPATH=${PWD}/.. HOME=${PWD}/../%{srcname}-data-%{data_commit} sphinx-build -b html . _build/html # remove the sphinx-build leftovers rm -rf _build/html/.{doctrees,buildinfo} popd diff --git a/sources b/sources index ad1a485..b0ccb4c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xarray-2024.6.0.tar.gz) = b6f24f834d71cca84f6a485858571a17bcb250915d4f84c886c9e16fc240ae3c3e91d573726e8a09f1dbe269abbfae97498868476eef1a90813ddb29c6a6db62 +SHA512 (xarray-2024.7.0.tar.gz) = 6a094dacdd8f09fb4674c67e03e1df67d0651053088fe39912713842dddb397cf5b5629193df170a4738dc8f75e96ae26582c73fac4679a1439e9d015dfcfcd1 SHA512 (xarray-data-7d8290e0be9d2a8f4b4381641f20a97db6eaea3d.tar.gz) = 3734ad5649b9ba23e8fe52ac1fc34694dcb3c761a1817e520726a83d31e725e2448aa0109ad7ad385572ae7d6a285bf1407d104f87227127a6a51d73b797a952