From 44629030b0917c84cbc03e70a0e05bb2393fa64f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mar 10 2019 01:30:56 +0000 Subject: Update to latest version. --- diff --git a/.gitignore b/.gitignore index fb51293..a74ef7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dask-1.1.3.tar.gz +/dask-1.1.4.tar.gz diff --git a/0001-Use-correct-dtype-when-test-concatenation.patch b/0001-Use-correct-dtype-when-test-concatenation.patch deleted file mode 100644 index 176816d..0000000 --- a/0001-Use-correct-dtype-when-test-concatenation.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 746f9f8ba3d86067160413bd8ddc68bbeb1a102c Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sun, 3 Mar 2019 04:58:33 -0500 -Subject: [PATCH 1/2] Use correct dtype when test concatenation. - -When all dtypes are the same, dask returns the same dtype. When they are -not all the same, then it defers to np.promote_dtypes. This function -always returns native byteorder, so fix the test. - -Signed-off-by: Elliott Sales de Andrade ---- - dask/array/tests/test_array_core.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dask/array/tests/test_array_core.py b/dask/array/tests/test_array_core.py -index 10239846..0da4d0bb 100644 ---- a/dask/array/tests/test_array_core.py -+++ b/dask/array/tests/test_array_core.py -@@ -362,7 +362,7 @@ def test_concatenate(): - - - @pytest.mark.parametrize('dtypes', [(('>f8', '>f8'), '>f8'), -- ((' +Date: Sun, 3 Mar 2019 05:24:13 -0500 +Subject: [PATCH] XFail partitioning test on some arches. + +Signed-off-by: Elliott Sales de Andrade +--- + dask/dataframe/tests/test_dataframe.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py +index 6422db37..2eb47421 100644 +--- a/dask/dataframe/tests/test_dataframe.py ++++ b/dask/dataframe/tests/test_dataframe.py +@@ -1,3 +1,4 @@ ++import platform + import textwrap + from distutils.version import LooseVersion + from itertools import product +@@ -1339,6 +1340,9 @@ def test_repartition_on_pandas_dataframe(): + assert_eq(ddf, df.y) + + ++@pytest.mark.xfail(platform.machine() in ('ppc64le', 'aarch64', 's390x', ++ 'i686', 'i586', 'i386'), ++ reason='Unsupported architecture') + @pytest.mark.parametrize('use_index', [True, False]) + @pytest.mark.parametrize('n', [1, 2, 4, 5]) + @pytest.mark.parametrize('k', [1, 2, 4, 5]) +-- +2.20.1 + diff --git a/0002-XFail-partitioning-test-on-some-arches.patch b/0002-XFail-partitioning-test-on-some-arches.patch deleted file mode 100644 index caa7c29..0000000 --- a/0002-XFail-partitioning-test-on-some-arches.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 44fcb19baa56b4b65109318575461fd50537ea82 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sun, 3 Mar 2019 05:24:13 -0500 -Subject: [PATCH 2/2] XFail partitioning test on some arches. - -Signed-off-by: Elliott Sales de Andrade ---- - dask/dataframe/tests/test_dataframe.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py -index 6422db37..2eb47421 100644 ---- a/dask/dataframe/tests/test_dataframe.py -+++ b/dask/dataframe/tests/test_dataframe.py -@@ -1,3 +1,4 @@ -+import platform - import textwrap - from distutils.version import LooseVersion - from itertools import product -@@ -1339,6 +1340,9 @@ def test_repartition_on_pandas_dataframe(): - assert_eq(ddf, df.y) - - -+@pytest.mark.xfail(platform.machine() in ('ppc64le', 'aarch64', 's390x', -+ 'i686', 'i586', 'i386'), -+ reason='Unsupported architecture') - @pytest.mark.parametrize('use_index', [True, False]) - @pytest.mark.parametrize('n', [1, 2, 4, 5]) - @pytest.mark.parametrize('k', [1, 2, 4, 5]) --- -2.20.1 - diff --git a/python-dask.spec b/python-dask.spec index 3310379..a281064 100644 --- a/python-dask.spec +++ b/python-dask.spec @@ -6,17 +6,15 @@ %global bootstrap 1 Name: python-%{srcname} -Version: 1.1.3 -Release: 4%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: Parallel PyData with Task Scheduling License: BSD URL: http://github.com/dask/dask/ Source0: https://files.pythonhosted.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz -# https://github.com/dask/dask/pull/4539 -Patch0001: 0002-Use-correct-dtype-when-test-concatenation.patch # https://github.com/dask/dask/issues/4561 -Patch0002: 0003-XFail-partitioning-test-on-some-arches.patch +Patch0001: 0001-XFail-partitioning-test-on-some-arches.patch BuildArch: noarch @@ -187,8 +185,9 @@ PYTHONDONTWRITEBYTECODE=1 \ %changelog -* Thu Mar 07 2019 Elliott Sales de Andrade - 1.1.3-4 -- Remove now unnecessary patch +* Sat Mar 09 2019 Elliott Sales de Andrade - 1.1.4-1 +- Update to latest version +- Remove now unnecessary patches * Wed Mar 06 2019 Elliott Sales de Andrade - 1.1.3-3 - Mark partitioning test as expected failure on 32-bit systems as well diff --git a/sources b/sources index 78a9cc5..87a1956 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dask-1.1.3.tar.gz) = 7efcd3fb497b81986126bd365fa54f19870103506b5e6645b029eb9d12bd7619073e95d045b0fda9133ff8a2bfa21df64fce135d3ff1b2225dd64633839a6166 +SHA512 (dask-1.1.4.tar.gz) = a34f4e6e9a5132d78c6344e1ed88f712fce19827e03e8eeef220bf9db5b68821e9bc5d936b990cf778e96327b1d00e87544d4b73abe3ea09dbbb7f4ce70269b4