From 18833ec076e8185b701e3fd7c4519e9da9fdc1f76850478bc3b8b73bbd467281 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix+novell.com@sebix.at>
Date: Fri, 21 May 2021 15:59:35 +0000
Subject: [PATCH] - update to version 0.18.2:  - This release reverts a
 regression in xarray's unstacking of dask-backed arrays.: - remove
 fix_test_resample_loffset.patch, doesn't work

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-xarray?expand=0&rev=52
---
 fix_test_resample_loffset.patch | 11 -----------
 python-xarray.changes           |  7 +++++++
 python-xarray.spec              |  8 +++-----
 xarray-0.18.1.tar.gz            |  3 ---
 xarray-0.18.2.tar.gz            |  3 +++
 5 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 fix_test_resample_loffset.patch
 delete mode 100644 xarray-0.18.1.tar.gz
 create mode 100644 xarray-0.18.2.tar.gz

diff --git a/fix_test_resample_loffset.patch b/fix_test_resample_loffset.patch
deleted file mode 100644
index 46d630b..0000000
--- a/fix_test_resample_loffset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xarray-0.18.1/xarray/tests/test_dataset.py	2021-05-19 15:51:40.453553119 +0200
-+++ xarray-0.18.1/xarray/tests/test_dataset.py	2021-05-19 15:52:03.669706686 +0200
-@@ -3988,7 +3988,7 @@
-         expected_ = ds.bar.to_series().resample("24H").mean()
-         expected_.index += to_offset("-12H")
-         expected = DataArray.from_series(expected_)
--        assert_identical(actual, expected)
-+        assert_allclose(actual, expected)
- 
-     def test_resample_by_mean_discarding_attrs(self):
-         times = pd.date_range("2000-01-01", freq="6H", periods=10)
diff --git a/python-xarray.changes b/python-xarray.changes
index b169007..62f62f7 100644
--- a/python-xarray.changes
+++ b/python-xarray.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 20 11:58:50 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+
+- update to version 0.18.2:
+ - This release reverts a regression in xarray's unstacking of dask-backed arrays.:
+- remove fix_test_resample_loffset.patch, doesn't work
+
 -------------------------------------------------------------------
 Wed May 19 13:53:54 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
 
diff --git a/python-xarray.spec b/python-xarray.spec
index c290590..2dda74d 100644
--- a/python-xarray.spec
+++ b/python-xarray.spec
@@ -21,14 +21,12 @@
 # NEP 29: Numpy 1.20 dropped support for Python 3.6, python36-numpy is removed from Tumbleweed. xarray will follow on next release
 %define         skip_python36 1
 Name:           python-xarray
-Version:        0.18.1
+Version:        0.18.2
 Release:        0
 Summary:        N-D labeled arrays and datasets in Python
 License:        Apache-2.0
 URL:            https://github.com/pydata/xarray
 Source:         https://files.pythonhosted.org/packages/source/x/xarray/xarray-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM fix_test_resample_loffset -- https://github.com/pydata/xarray/issues/5341
-Patch0:         fix_test_resample_loffset.patch
 BuildRequires:  %{python_module numpy >= 1.15}
 BuildRequires:  %{python_module numpy-devel >= 1.14}
 BuildRequires:  %{python_module pandas >= 0.25}
@@ -82,7 +80,6 @@ The dataset is an in-memory representation of a netCDF file.
 
 %prep
 %autosetup -p1 -n xarray-%{version}
-%patch0 -p1
 chmod -x xarray/util/print_versions.py
 
 %build
@@ -95,7 +92,8 @@ chmod -x xarray/util/print_versions.py
 %check
 if [ $(getconf LONG_BIT) -eq 32 ]; then
   # precision errors on 32-bit
-  donttest="(test_interpolate_chunk_advanced and linear)"
+  # for test_resample_loffset: https://github.com/pydata/xarray/issues/5341
+  donttest="((test_interpolate_chunk_advanced or test_resample_loffset) and linear)"
 fi
 %pytest -n auto ${donttest:+ -k "not ($donttest)"} xarray
 
diff --git a/xarray-0.18.1.tar.gz b/xarray-0.18.1.tar.gz
deleted file mode 100644
index 0bfcf32..0000000
--- a/xarray-0.18.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47177fbd76d656852f742d2d8e97e9dfc97b68a91d03dd26ca5475319fc8d859
-size 2849935
diff --git a/xarray-0.18.2.tar.gz b/xarray-0.18.2.tar.gz
new file mode 100644
index 0000000..b8a3570
--- /dev/null
+++ b/xarray-0.18.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284
+size 2850065