From e2bcbfcf0b9bb0bbf1eb55cbad822641d75e4077 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mar 10 2019 01:01:50 +0000 Subject: Remove now-unnecessary patch. --- diff --git a/0001-Mark-test_cov_corr_stable-xfail-on-32-bit.patch b/0001-Mark-test_cov_corr_stable-xfail-on-32-bit.patch deleted file mode 100644 index ee6cb9e..0000000 --- a/0001-Mark-test_cov_corr_stable-xfail-on-32-bit.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 69f34ed54a9ef88361a2d3dbc25dfe6b099afe81 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Fri, 27 Jul 2018 04:34:16 -0400 -Subject: [PATCH 1/3] Mark test_cov_corr_stable xfail on 32-bit. - -Signed-off-by: Elliott Sales de Andrade ---- - dask/dataframe/tests/test_dataframe.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py -index 6422db37..0b4c7e76 100644 ---- a/dask/dataframe/tests/test_dataframe.py -+++ b/dask/dataframe/tests/test_dataframe.py -@@ -1,3 +1,4 @@ -+import sys - import textwrap - from distutils.version import LooseVersion - from itertools import product -@@ -2246,6 +2247,7 @@ def test_cov_corr_meta(): - assert ddf.a.corr(ddf.b)._meta.dtype == 'f8' - - -+@pytest.mark.xfail(sys.maxsize <= 2**32, reason='32-bit system') - @pytest.mark.slow - def test_cov_corr_stable(): - df = pd.DataFrame(np.random.uniform(-1, 1, (20000000, 2)), columns=['a', 'b']) --- -2.20.1 - diff --git a/0001-Use-correct-dtype-when-test-concatenation.patch b/0001-Use-correct-dtype-when-test-concatenation.patch new file mode 100644 index 0000000..176816d --- /dev/null +++ b/0001-Use-correct-dtype-when-test-concatenation.patch @@ -0,0 +1,30 @@ +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 04:58:33 -0500 -Subject: [PATCH 2/3] 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 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/0003-XFail-partitioning-test-on-some-arches.patch b/0003-XFail-partitioning-test-on-some-arches.patch deleted file mode 100644 index 92f8d16..0000000 --- a/0003-XFail-partitioning-test-on-some-arches.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a37ed9e54bd28bc84127c78ee5026f7611fd132c Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sun, 3 Mar 2019 05:24:13 -0500 -Subject: [PATCH 3/3] 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 0b4c7e76..5205a292 100644 ---- a/dask/dataframe/tests/test_dataframe.py -+++ b/dask/dataframe/tests/test_dataframe.py -@@ -1,3 +1,4 @@ -+import platform - import sys - import textwrap - from distutils.version import LooseVersion -@@ -1340,6 +1341,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 da990e8..3310379 100644 --- a/python-dask.spec +++ b/python-dask.spec @@ -7,18 +7,16 @@ Name: python-%{srcname} Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?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/issues/2022 -Patch0001: 0001-Mark-test_cov_corr_stable-xfail-on-32-bit.patch # https://github.com/dask/dask/pull/4539 -Patch0002: 0002-Use-correct-dtype-when-test-concatenation.patch -# https://github.com/dask/dask/issues/2022 -Patch0003: 0003-XFail-partitioning-test-on-some-arches.patch +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 BuildArch: noarch @@ -189,6 +187,9 @@ PYTHONDONTWRITEBYTECODE=1 \ %changelog +* Thu Mar 07 2019 Elliott Sales de Andrade - 1.1.3-4 +- Remove now unnecessary patch + * Wed Mar 06 2019 Elliott Sales de Andrade - 1.1.3-3 - Mark partitioning test as expected failure on 32-bit systems as well