From c326b22baa8edea448e9e75b7a3bded7b02405b2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 10 May 2024 12:00:34 +0200 Subject: [PATCH 1/7] python311Packages.distributed: 2024.4.2 -> 2024.5.0 Diff: https://github.com/dask/distributed/compare/refs/tags/2024.4.2...2024.5.0 Changelog: https://github.com/dask/distributed/blob/2024.5.0/docs/source/changelog.rst --- pkgs/development/python-modules/distributed/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 890f579207ca..35c1df57422a 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.4.2"; + version = "2024.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-xoQ+b7qzstZl9gRNs4jssNOsGQHDdvTXU7pTjBSuyWs="; + hash = "sha256-9W5BpBQHw1ZXCOWiFPeIlMns/Yys1gtdwQ4Lhd7qjK8="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools setuptools-scm @@ -54,7 +54,7 @@ buildPythonPackage rec { "dask" ]; - propagatedBuildInputs = [ + dependencies = [ click cloudpickle dask From a386dfc86f5bf88187620bb849f216c5f72e8197 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 11:52:43 +0200 Subject: [PATCH 2/7] python311Packages.dask-glm: fix darwin tests by allowing local networking --- pkgs/development/python-modules/dask-glm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index dd5cfe0d2981..15a7df7fe029 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -59,6 +59,8 @@ buildPythonPackage rec { "test_determinism_distributed" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; From 20ba5337cd07c267b44b0915574b70ffa0ebed79 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 11:52:13 +0200 Subject: [PATCH 3/7] python311Packages.dask-ml: 2023.3.24 -> 2024.4.4 Changelog: https://github.com/dask/dask-ml/releases/tag/v2024.4.4 --- .../python-modules/dask-ml/default.nix | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 3cb7ed9618b1..189b884c3132 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -1,37 +1,47 @@ { lib , buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatch-vcs +, hatchling +, setuptools-scm , dask +, dask-expr , dask-glm , distributed -, fetchPypi , multipledispatch , numba , numpy , packaging , pandas -, pythonOlder , scikit-learn , scipy -, setuptools-scm +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { pname = "dask-ml"; - version = "2023.3.24"; - format = "setuptools"; + version = "2024.4.4"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-lsCQ220yg2U24/Ccpk3rWZ6GRYeqjj1NLGtK9YhzMwc="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-ml"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU="; }; - nativeBuildInputs = [ + build-system = [ + hatch-vcs + hatchling setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + dask-expr dask-glm distributed multipledispatch @@ -44,9 +54,6 @@ buildPythonPackage rec { ] ++ dask.optional-dependencies.array ++ dask.optional-dependencies.dataframe; - # has non-standard build from source, and pypi doesn't include tests - doCheck = false; - pythonImportsCheck = [ "dask_ml" "dask_ml.naive_bayes" @@ -54,6 +61,13 @@ buildPythonPackage rec { "dask_ml.utils" ]; + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; From 3ad32d9319f73ba9fed9ef6b9b9b367587cbb5f3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 12:10:01 +0200 Subject: [PATCH 4/7] python311Packages.dask-ml: add GaetanLepage as maintainer --- pkgs/development/python-modules/dask-ml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 189b884c3132..9c19a072ee58 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } From 7a0e77734252214e24b397b0a7b6cabe1cf807fd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 13:34:57 +0200 Subject: [PATCH 5/7] python311Packages.dask-expr: fix darwin tests by allowing local networking --- pkgs/development/python-modules/dask-expr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 8a13311116c7..657d588931e7 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -51,6 +51,8 @@ buildPythonPackage rec { pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = ""; homepage = "https://github.com/dask/dask-expr"; From 284b1e9a069653717897820b8d9ff75681bf0e0c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 13:58:01 +0200 Subject: [PATCH 6/7] python311Packages.dask-awkward: fix darwin tests by allowing local networking --- pkgs/development/python-modules/dask-awkward/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index e24b06a23b68..26f2c2bb5191 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -77,6 +77,8 @@ buildPythonPackage rec { "test_basic_root_works" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; From f2eef16cf5977616653d7e43ed3a2e294418cbc3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 15:09:56 +0200 Subject: [PATCH 7/7] python311Packages.coffea: fix darwin tests by allowing local networking --- pkgs/development/python-modules/coffea/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 86090e3b2556..538e25ee0157 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -88,6 +88,8 @@ buildPythonPackage rec { "coffea" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis"; homepage = "https://github.com/CoffeaTeam/coffea";