From b594649f43fa3b01b77e98f2a58554b034a63583 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 8 Nov 2024 23:58:38 +0100 Subject: [PATCH 1/4] python312Packages.dask-expr: 1.1.16 -> 1.1.19 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.16...v1.1.19 --- pkgs/development/python-modules/dask-expr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 5f66528967e0..5c09c76daccb 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.16"; + version = "1.1.19"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-HHoUQ6LfrlUnZNvvbPbQbNW6WLabGa88RsC9M8hlARI="; + hash = "sha256-Uze6YxNEuy5izx4tqORgCjD+ItH9Hf1vrbXU7fn4o1M="; }; postPatch = '' From c5facb4c7df92a6ca48c416b49a368503e7e2e93 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 9 Nov 2024 00:13:03 +0100 Subject: [PATCH 2/4] python312Packages.distributed: 2024.10.0 -> 2024.11.2 Diff: https://github.com/dask/distributed/compare/refs/tags/2024.10.0...2024.11.2 Changelog: https://github.com/dask/distributed/releases/tag/2024.11.2 --- 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 e652d8276034..4103bf1d0582 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 = "2024.10.0"; + version = "2024.11.2"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-pdVqPzz66CueGuha66RTykrLtEGx9i6aScR+NHIYWg0="; + hash = "sha256-V+SObUbzrfSI6h5HinyzvffsbcjvXZ8IZss67qIwxKM="; }; postPatch = '' From 783f44cd4ebb1ed04fdd4a4bfc22adfdfb327fa6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 9 Nov 2024 00:24:03 +0100 Subject: [PATCH 3/4] python312Packages.dask: 2024.10.0 -> 2024.11.2 Diff: https://github.com/dask/dask/compare/refs/tags/2024.10.0...2024.11.2 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 014f8947d35b..21a4324be797 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -39,14 +39,14 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.10.0"; + version = "2024.11.2"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-UB/LqgDRXnjJ/RjEke9eBDyVAy+Dtak7wYJB63xmDd4="; + hash = "sha256-mAdjsfXzHGJ37m4nQbi+A+4qrL/CHcQNuoGaeU9Nwwo="; }; build-system = [ setuptools ]; From d1cae02bdf0a8c4d976ce834cc6918d653c13c69 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 10 Nov 2024 21:47:08 +0100 Subject: [PATCH 4/4] python312Packages.dask-ml: fix darwin build --- .../python-modules/dask-ml/default.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 6b96c3d2199a..427f1b446c21 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -1,12 +1,15 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system hatch-vcs, hatchling, setuptools-scm, - dask, + + # dependencies dask-expr, dask-glm, distributed, @@ -17,6 +20,9 @@ pandas, scikit-learn, scipy, + dask, + + # tests pytest-mock, pytestCheckHook, }: @@ -26,8 +32,6 @@ buildPythonPackage rec { version = "2024.4.4"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-ml"; @@ -66,11 +70,19 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # AttributeError: 'csr_matrix' object has no attribute 'A' - # Fixed in https://github.com/dask/dask-ml/pull/996 - "tests/test_svd.py" - ]; + disabledTestPaths = + [ + # AttributeError: 'csr_matrix' object has no attribute 'A' + # Fixed in https://github.com/dask/dask-ml/pull/996 + "tests/test_svd.py" + ] + ++ lib.optionals stdenv.isDarwin [ + # RuntimeError: Not enough arguments provided: missing keys + "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 = [ # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match)