diff --git a/.gitignore b/.gitignore index f7e591c..79f759f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /dask-1.1.5.tar.gz /dask-1.2.0.tar.gz /dask-1.2.1.tar.gz +/dask-2.1.0.tar.gz diff --git a/0001-XFail-partitioning-test-on-some-arches.patch b/0001-XFail-partitioning-test-on-some-arches.patch index 2783386..92b7e2e 100644 --- a/0001-XFail-partitioning-test-on-some-arches.patch +++ b/0001-XFail-partitioning-test-on-some-arches.patch @@ -1,7 +1,7 @@ -From 373dd6f27d044da6c3ad657fa2d837be74377f94 Mon Sep 17 00:00:00 2001 +From abddcd7c2c6dc6cc72af8f4a7fb44e317994cef9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 3 Mar 2019 05:24:13 -0500 -Subject: [PATCH] XFail partitioning test on some arches. +Subject: [PATCH 1/3] XFail partitioning test on some arches. Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+) diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py -index 46f8a377..a7d58fbe 100644 +index 387d39ac..e0160734 100644 --- a/dask/dataframe/tests/test_dataframe.py +++ b/dask/dataframe/tests/test_dataframe.py @@ -1,3 +1,4 @@ @@ -17,16 +17,16 @@ index 46f8a377..a7d58fbe 100644 import textwrap import warnings from itertools import product -@@ -1452,6 +1453,9 @@ def test_repartition_on_pandas_dataframe(): +@@ -1722,6 +1723,9 @@ def test_repartition_on_pandas_dataframe(): assert_eq(ddf, df.y) +@pytest.mark.xfail(platform.machine() in ('ppc64', '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]) + @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 +2.21.0 diff --git a/0002-Make-distributed-tests-optional-again.patch b/0002-Make-distributed-tests-optional-again.patch new file mode 100644 index 0000000..f11d192 --- /dev/null +++ b/0002-Make-distributed-tests-optional-again.patch @@ -0,0 +1,46 @@ +From 04b7d5986fcf853c652557a3c837dae86a5c1d3e Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Mon, 22 Jul 2019 03:27:22 -0400 +Subject: [PATCH 2/3] Make distributed tests optional again. + +Signed-off-by: Elliott Sales de Andrade +--- + dask/tests/test_base.py | 4 ---- + dask/tests/test_distributed.py | 5 +++++ + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/dask/tests/test_base.py b/dask/tests/test_base.py +index 7fceec7d..864b2073 100644 +--- a/dask/tests/test_base.py ++++ b/dask/tests/test_base.py +@@ -1018,7 +1018,3 @@ def test_num_workers_config(scheduler): + workers = {i.worker_id for i in prof.results} + + assert len(workers) == num_workers +- +- +-if sys.version_info >= (3, 5): +- from dask.tests.py3_test_await import * # noqa F401 +diff --git a/dask/tests/test_distributed.py b/dask/tests/test_distributed.py +index 60e8cf32..7ed081f6 100644 +--- a/dask/tests/test_distributed.py ++++ b/dask/tests/test_distributed.py +@@ -2,6 +2,7 @@ import pytest + + distributed = pytest.importorskip("distributed") + ++import sys + from functools import partial + from operator import add + from tornado import gen +@@ -194,3 +195,7 @@ def test_scheduler_equals_client(loop): + assert client.run_on_scheduler( + lambda dask_scheduler: dask_scheduler.story(x.key) + ) ++ ++ ++if sys.version_info >= (3, 5): ++ from dask.tests.py3_test_await import * # noqa F401 +-- +2.21.0 + diff --git a/0003-TST-Ignore-some-more-invalid-value-warnings.patch b/0003-TST-Ignore-some-more-invalid-value-warnings.patch new file mode 100644 index 0000000..bff4ebe --- /dev/null +++ b/0003-TST-Ignore-some-more-invalid-value-warnings.patch @@ -0,0 +1,32 @@ +From ec7aa4ead8bcf963f7c314676dbda6c6852d7eb2 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Tue, 23 Jul 2019 00:34:12 -0400 +Subject: [PATCH 3/3] TST: Ignore some more invalid value warnings. + +Signed-off-by: Elliott Sales de Andrade +--- + dask/array/tests/test_reductions.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/dask/array/tests/test_reductions.py b/dask/array/tests/test_reductions.py +index c17e919d..3d8163f6 100644 +--- a/dask/array/tests/test_reductions.py ++++ b/dask/array/tests/test_reductions.py +@@ -407,8 +407,14 @@ def test_nan_object(func): + + if func in {"nanmin", "nanmax"}: + warnings.simplefilter("default", RuntimeWarning) ++ elif func in {"min", "max"}: ++ warnings.simplefilter("ignore", RuntimeWarning) + + assert_eq(getattr(np, func)(x, axis=0), getattr(da, func)(d, axis=0)) ++ ++ if func in {"min", "max"}: ++ warnings.simplefilter("default", RuntimeWarning) ++ + assert_eq(getattr(np, func)(x, axis=1), getattr(da, func)(d, axis=1)) + assert_eq(getattr(np, func)(x), getattr(da, func)(d)) + +-- +2.21.0 + diff --git a/python-dask.spec b/python-dask.spec index 8f7ce81..a6bb94d 100644 --- a/python-dask.spec +++ b/python-dask.spec @@ -1,12 +1,11 @@ %global srcname dask # Requires distributed, which is a loop. -%{?_with_bootstrap: %global bootstrap 1} # Force bootstrap for package review. -%global bootstrap 1 +%bcond_without bootstrap Name: python-%{srcname} -Version: 1.2.1 +Version: 2.1.0 Release: 1%{?dist} Summary: Parallel PyData with Task Scheduling @@ -15,6 +14,10 @@ URL: http://github.com/dask/dask/ Source0: %pypi_source # https://github.com/dask/dask/issues/4561 Patch0001: 0001-XFail-partitioning-test-on-some-arches.patch +# https://github.com/dask/dask/pull/5128 +Patch0002: 0002-Make-distributed-tests-optional-again.patch +# https://github.com/dask/dask/pull/5140 +Patch0003: 0003-TST-Ignore-some-more-invalid-value-warnings.patch BuildArch: noarch @@ -32,13 +35,13 @@ BuildRequires: python3dist(graphviz) BuildRequires: python3dist(ipython) BuildRequires: python3dist(numpy) >= 1.13 BuildRequires: python3dist(pandas) >= 0.21 -BuildRequires: python3dist(partd) >= 0.3.8 +BuildRequires: python3dist(partd) >= 0.3.10 BuildRequires: python3dist(pytest) BuildRequires: python3dist(pyyaml) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(toolz) >= 0.7.3 -%if ! 0%{?bootstrap} -BuildRequires: python3dist(distributed) >= 1.22 +%if %{with bootstrap} +BuildRequires: python3dist(distributed) >= 2 %endif Recommends: python3-%{srcname}+array = %{version}-%{release} @@ -117,7 +120,7 @@ BuildArch: noarch %{?python_provide:%python_provide python3-%{srcname}+distributed} Requires: python3-%{srcname} = %{version}-%{release} -Requires: python3dist(distributed) >= 1.22 +Requires: python3dist(distributed) >= 2 %description -n python3-%{srcname}+distributed This package installs dask with dependencies required for its distributed @@ -125,7 +128,7 @@ feature. Dask is a flexible parallel computing library for analytics. -%if ! 0%{?bootstrap} +%if %{with bootstrap} %package -n python-%{srcname}-doc Summary: dask documentation @@ -148,7 +151,7 @@ rm -rf %{srcname}.egg-info %build %py3_build -%if ! 0%{?bootstrap} +%if %{with bootstrap} # generate html docs PYTHONPATH=${PWD} sphinx-build-3 docs/source html # remove the sphinx-build leftovers @@ -177,7 +180,7 @@ PYTHONDONTWRITEBYTECODE=1 \ %files -n python3-%{srcname}+delayed %files -n python3-%{srcname}+distributed -%if ! 0%{?bootstrap} +%if %{with bootstrap} %files -n python-%{srcname}-doc %doc html %license LICENSE.txt @@ -185,6 +188,9 @@ PYTHONDONTWRITEBYTECODE=1 \ %changelog +* Tue Jul 23 2019 Elliott Sales de Andrade - 2.1.0-1 +- Update to latest version + * Sat Apr 13 2019 Elliott Sales de Andrade - 1.2.0-1 - Update to latest version diff --git a/sources b/sources index 942bcd7..a263e6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dask-1.2.1.tar.gz) = 3fde4a1834a7626df0e2a0a91805c5906c58f92b033583b04c535956da311aff09bbebc20872850454172dfbf18fd5d163b6281df25a28a284cd5ba36a212213 +SHA512 (dask-2.1.0.tar.gz) = b834b0724f460d92de6f687ec6c51c590fa29a9598656724958881c967a58f1fbd37f077d6c0f57c3faa64cc5612eec9bb895cb59c7068563ad6cd7da5adfee1