From 3b2ea300aac85cf74692d19a38f8c558c81bcda4e9e209ce933345dcbe231784 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 15 Feb 2024 12:56:11 +0000 Subject: [PATCH] Accepting request 1146780 from home:bnavigator:branches:devel:languages:python:numeric - Update to 2024.2.0 * Deprecate Dask DataFrame implementation * Improved tokenization * https://docs.dask.org/en/stable/changelog.html#v2024-2-0 - Add distributed-ignore-daskdepr.patch gh#dask/distributed#8504 - Drop python39 test flavor - Fix python312 tests OBS-URL: https://build.opensuse.org/request/show/1146780 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-distributed?expand=0&rev=163 --- _multibuild | 1 - distributed-2024.1.1-gh.tar.gz | 3 --- distributed-2024.2.0-gh.tar.gz | 3 +++ distributed-ignore-daskdepr.patch | 21 +++++++++++++++++++++ distributed-ignore-offline.patch | 8 ++++---- distributed-ignore-rerun.patch | 8 ++++---- distributed-ignore-thread-leaks.patch | 8 ++++---- python-distributed.changes | 11 +++++++++++ python-distributed.spec | 22 ++++++++++------------ 9 files changed, 57 insertions(+), 28 deletions(-) delete mode 100644 distributed-2024.1.1-gh.tar.gz create mode 100644 distributed-2024.2.0-gh.tar.gz create mode 100644 distributed-ignore-daskdepr.patch diff --git a/_multibuild b/_multibuild index 98d9f20..6d8cafe 100644 --- a/_multibuild +++ b/_multibuild @@ -1,5 +1,4 @@ - test-py39 test-py310 test-py311 test-py312 diff --git a/distributed-2024.1.1-gh.tar.gz b/distributed-2024.1.1-gh.tar.gz deleted file mode 100644 index 5ff74ff..0000000 --- a/distributed-2024.1.1-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0f7cc2d7240e17f8d24b7f0d6e6ec45936f1c6c3c353f42c07582e5b66e3b77 -size 2539830 diff --git a/distributed-2024.2.0-gh.tar.gz b/distributed-2024.2.0-gh.tar.gz new file mode 100644 index 0000000..15e9168 --- /dev/null +++ b/distributed-2024.2.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe10a21ba273008616cfde57aeb0fe947a0f69c4e1db47a278a0eded06938d3b +size 2539820 diff --git a/distributed-ignore-daskdepr.patch b/distributed-ignore-daskdepr.patch new file mode 100644 index 0000000..3dcb550 --- /dev/null +++ b/distributed-ignore-daskdepr.patch @@ -0,0 +1,21 @@ +From dd916f1b90264fe8c2ce82ff0c7bdecb85306a58 Mon Sep 17 00:00:00 2001 +From: James Bourbeau +Date: Mon, 12 Feb 2024 16:49:21 -0600 +Subject: [PATCH] Ignore dask-expr warning in CI + +--- + pyproject.toml | 1 + + 1 file changed, 1 insertion(+) + +Index: distributed-2024.2.0/pyproject.toml +=================================================================== +--- distributed-2024.2.0.orig/pyproject.toml ++++ distributed-2024.2.0/pyproject.toml +@@ -149,6 +149,7 @@ filterwarnings = [ + # https://github.com/dask/dask/pull/10622 + '''ignore:Minimal version of pyarrow will soon be increased to 14.0.1''', + '''ignore:the matrix subclass is not the recommended way''', ++ '''ignore:The current Dask DataFrame implementation is deprecated.*:DeprecationWarning''', + ] + minversion = "6" + markers = [ diff --git a/distributed-ignore-offline.patch b/distributed-ignore-offline.patch index ddd75c9..5feca98 100644 --- a/distributed-ignore-offline.patch +++ b/distributed-ignore-offline.patch @@ -1,8 +1,8 @@ -Index: distributed-2023.9.1/pyproject.toml +Index: distributed-2024.2.0/pyproject.toml =================================================================== ---- distributed-2023.9.1.orig/pyproject.toml -+++ distributed-2023.9.1/pyproject.toml -@@ -116,7 +116,7 @@ filterwarnings = [ +--- distributed-2024.2.0.orig/pyproject.toml ++++ distributed-2024.2.0/pyproject.toml +@@ -117,7 +117,7 @@ filterwarnings = [ '''ignore:unclosed transport <_SelectorSocketTransport.*:ResourceWarning''', '''ignore:unclosed transport + +- Update to 2024.2.0 + * Deprecate Dask DataFrame implementation + * Improved tokenization + * https://docs.dask.org/en/stable/changelog.html#v2024-2-0 +- Add distributed-ignore-daskdepr.patch gh#dask/distributed#8504 +- Drop python39 test flavor +- Fix python312 tests + ------------------------------------------------------------------- Sun Feb 4 21:31:24 UTC 2024 - Ben Greiner diff --git a/python-distributed.spec b/python-distributed.spec index 6c954c5..9a8264a 100644 --- a/python-distributed.spec +++ b/python-distributed.spec @@ -18,43 +18,36 @@ %define psuffix %{nil} %global flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "test-py39" -%define psuffix -test-py39 -%define skip_python310 1 -%define skip_python311 1 -%define skip_python312 1 -%bcond_without test -%endif %if "%{flavor}" == "test-py310" %define psuffix -test-py310 -%define skip_python39 1 %define skip_python311 1 %define skip_python312 1 %bcond_without test %endif %if "%{flavor}" == "test-py311" %define psuffix -test-py311 -%define skip_python39 1 %define skip_python310 1 %define skip_python312 1 %bcond_without test %endif %if "%{flavor}" == "test-py312" %define psuffix -test-py312 -%define skip_python39 1 %define skip_python310 1 %define skip_python311 1 %bcond_without test %endif %if "%{flavor}" == "" %bcond_with test +%else +# globally stop testing this one +%define skip_python39 1 %endif # use this to run tests with xdist in parallel, unfortunately fails server side %bcond_with paralleltests Name: python-distributed%{psuffix} # ===> Note: python-dask MUST be updated in sync with python-distributed! <=== -Version: 2024.1.1 +Version: 2024.2.0 Release: 0 Summary: Library for distributed computing with Python License: BSD-3-Clause @@ -62,6 +55,8 @@ URL: https://distributed.dask.org # SourceRepository: https://github.com/dask/distributed Source: https://github.com/dask/distributed/archive/refs/tags/%{version}.tar.gz#/distributed-%{version}-gh.tar.gz Source99: python-distributed-rpmlintrc +# PATCH-FIX-UPSTREAM distributed-ignore-daskdepr.patch gh#dask/distributed#8504 +Patch0: distributed-ignore-daskdepr.patch # PATCH-FIX-OPENSUSE distributed-ignore-off.patch -- ignore that we can't probe addresses on obs, code@bnavigator.de Patch3: distributed-ignore-offline.patch # PATCH-FIX-OPENSUSE distributed-ignore-thread-leaks.patch -- ignore leaking threads on obs, code@bnavigator.de @@ -174,11 +169,14 @@ donttest+=" or (test_worker and test_gather_dep_from_remote_workers_if_all_local donttest+=" or (test_worker and test_worker_reconnects_mid_compute)" donttest+=" or (test_worker_memory and test_digests)" donttest+=" or (test_worker_memory and test_pause_while_spilling)" -donttest+=" or (test_computations_futures)" +donttest+=" or test_computations_futures" +donttest+=" or test_task_state_instance_are_garbage_collected" # server-side fail due to the non-network warning in a subprocess where the patched filter does not apply donttest+=" or (test_client and test_quiet_close_process)" # should return > 3, returns 3 exactly donttest+=" or (test_statistical_profiling_cycle)" +# pytest7 on py312: returns len==2 instead of 1 +donttest+=" or test_computation_object_code_dask_compute" # flakey on 3.10 donttest+=" or (test_client_worker)" if [[ $(getconf LONG_BIT) -eq 32 ]]; then