From 636d3ad59ee808d823a480819b600583370a5a4b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 21 Mar 2025 23:19:16 +0100 Subject: [PATCH 1/5] python312Packages.dask: 2025.2.0 -> 2025.3.0 Diff: https://github.com/dask/dask/compare/refs/tags/2025.2.0...2025.3.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index bc89b8ee9ce8..a61a44afbfb2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "dask"; - version = "2025.2.0"; + version = "2025.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; tag = version; - hash = "sha256-PpgzlaVWKW+aLbFtDztNjBMI79pmsiS3uN8su75Rako="; + hash = "sha256-j25+DfWReonXKqxkX9OVHjKo+Indh13rlBE5PyGe69c="; }; postPatch = '' @@ -67,10 +67,10 @@ buildPythonPackage rec { click cloudpickle fsspec + importlib-metadata packaging partd pyyaml - importlib-metadata toolz ]; From c377eb6453d0c92312064e8d7bac9cf053572c64 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 21 Mar 2025 23:19:34 +0100 Subject: [PATCH 2/5] python312Packages.distributed: 2025.2.0 -> 2025.3.0 Diff: https://github.com/dask/distributed/compare/refs/tags/2025.2.0...2025.3.0 Changelog: https://github.com/dask/distributed/releases/tag/2025.3.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 2719e80e5a31..522add7a8098 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2025.2.0"; + version = "2025.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; tag = version; - hash = "sha256-bpyON5rrZ+Xf6Vkmyd8UXe/MQJ9jEhjVE+5YkAJ5AeM="; + hash = "sha256-+vegdEXhQi3ns5iMs6FavKnAlRNIWCUNyZENVBWZsuQ="; }; postPatch = '' From fc89becbc694ca34e9caf6627743efbc5634d89a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 24 Mar 2025 10:37:01 +0100 Subject: [PATCH 3/5] python312Packages.odc-stac: fix broken import https://github.com/dask/dask/issues/11843 --- pkgs/development/python-modules/odc-stac/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix index a5d9f8f94b31..5a55132db317 100644 --- a/pkgs/development/python-modules/odc-stac/default.nix +++ b/pkgs/development/python-modules/odc-stac/default.nix @@ -39,6 +39,15 @@ buildPythonPackage rec { hash = "sha256-uudBzxVGt3RW4ppDrFYfA9LMa2xPfs3FTBzVS19FjB4="; }; + # ImportError: cannot import name 'quote' from 'dask.base' + # https://github.com/dask/dask/issues/11843 + postPatch = '' + substituteInPlace odc/loader/_builder.py \ + --replace-fail \ + "from dask.base import quote, tokenize" \ + "from dask.base import tokenize; from dask.core import quote" + ''; + build-system = [ setuptools ]; From e5616864e34445a6093669d5a17a8910acd71ea3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 25 Mar 2025 09:57:23 +0100 Subject: [PATCH 4/5] python312Packages.dask-ml: skip failing tests https://github.com/dask/dask-ml/issues/1016 --- pkgs/development/python-modules/dask-ml/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 9ec027fcb00a..0a3d34493f9f 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -69,8 +69,12 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # AttributeError: module 'numpy' has no attribute 'product' - "tests/test_svd.py" + # RuntimeError: Attempting to use an asynchronous Client in a synchronous context of `dask.compute` + # https://github.com/dask/dask-ml/issues/1016 + "tests/model_selection/test_hyperband.py" + "tests/model_selection/test_incremental.py" + "tests/model_selection/test_incremental_warns.py" + "tests/model_selection/test_successive_halving.py" ]; disabledTests = [ From 3dca747df57a51390688f8c9f75e2121fc370476 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 25 Mar 2025 10:05:01 +0100 Subject: [PATCH 5/5] python312Packages.dask-awkward: disable failing tests https://github.com/dask-contrib/dask-awkward/issues/573 --- pkgs/development/python-modules/dask-awkward/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index d639f09d883c..6c423a611049 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -72,6 +72,11 @@ buildPythonPackage rec { "test_basic_root_works" # Flaky. https://github.com/dask-contrib/dask-awkward/issues/506. "test_distance_behavior" + + # RuntimeError: Attempting to use an asynchronous Client in a synchronous context of `dask.compute` + # https://github.com/dask-contrib/dask-awkward/issues/573 + "test_persist" + "test_ravel_fail" ]; __darwinAllowLocalNetworking = true;