diff --git a/0004-Fix-type-inference-for-dask-push.patch b/0004-Fix-type-inference-for-dask-push.patch deleted file mode 100644 index da071b9..0000000 --- a/0004-Fix-type-inference-for-dask-push.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c15aabe93e8468ac7561bbdcc2a1a2898bc07d83 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Thu, 20 May 2021 02:40:23 -0400 -Subject: [PATCH 4/5] Fix type inference for dask push. - -Signed-off-by: Elliott Sales de Andrade ---- - xarray/core/dask_array_ops.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/xarray/core/dask_array_ops.py b/xarray/core/dask_array_ops.py -index 87f67028..0bd2cece 100644 ---- a/xarray/core/dask_array_ops.py -+++ b/xarray/core/dask_array_ops.py -@@ -66,9 +66,10 @@ def push(array, n, axis): - ) - if all(c == 1 for c in array.chunks[axis]): - array = array.rechunk({axis: 2}) -- pushed = array.map_blocks(push, axis=axis, n=n) -+ pushed = array.map_blocks(push, axis=axis, n=n, dtype=array.dtype, meta=array._meta) - if len(array.chunks[axis]) > 1: - pushed = pushed.map_overlap( -- push, axis=axis, n=n, depth={axis: (1, 0)}, boundary="none" -+ push, axis=axis, n=n, depth={axis: (1, 0)}, boundary="none", -+ dtype=array.dtype, meta=array._meta - ) - return pushed --- -2.31.1 - diff --git a/0005-fix-dask-meta-and-output_dtypes-error-5449.patch b/0005-fix-dask-meta-and-output_dtypes-error-5449.patch deleted file mode 100644 index 769352c..0000000 --- a/0005-fix-dask-meta-and-output_dtypes-error-5449.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5dfe10420c28fac4a382b17a6993211373286b50 Mon Sep 17 00:00:00 2001 -From: Mathias Hauser -Date: Mon, 7 Jun 2021 23:05:24 +0200 -Subject: [PATCH 5/5] fix dask meta and output_dtypes error (#5449) - -Signed-off-by: Elliott Sales de Andrade ---- - xarray/tests/test_computation.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xarray/tests/test_computation.py b/xarray/tests/test_computation.py -index cbfa61a4..2d2e019d 100644 ---- a/xarray/tests/test_computation.py -+++ b/xarray/tests/test_computation.py -@@ -1306,7 +1306,10 @@ def test_vectorize_dask_dtype_without_output_dtypes(data_array): - assert expected.dtype == actual.dtype - - --@pytest.mark.xfail(LooseVersion(dask.__version__) < "2.3", reason="dask GH5274") -+@pytest.mark.skipif( -+ LooseVersion(dask.__version__) > "2021.06", -+ reason="dask/dask#7669: can no longer pass output_dtypes and meta", -+) - @requires_dask - def test_vectorize_dask_dtype_meta(): - # meta dtype takes precedence --- -2.31.1 -