From 38293461a1ff6618cdbecdcc9b98a6863052621c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 20 Jul 2024 09:57:10 +0200 Subject: [PATCH 1/4] python311Packages.dask: 2024.7.0 -> 2024.7.1 Diff: https://github.com/dask/dask/compare/refs/tags/2024.7.0...2024.7.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index ce78dd686404..285dbeba4c56 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -6,7 +6,6 @@ # build-system setuptools, - wheel, # dependencies click, @@ -41,7 +40,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.7.0"; + version = "2024.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,13 +49,10 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-EvDn7i4GOEHYwhptYF+2yKUb3VDWjR7/WCUGKEJi/H4="; + hash = "sha256-aHira3GKtw674VQ5bc5lFEWyuLf4ZWexKQP6eaGwbzg="; }; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ click From 09612a9d56728de1b66ae4b7c644991a4e79b752 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 20 Jul 2024 10:17:47 +0200 Subject: [PATCH 2/4] python311Packages.dask-expr: 1.1.7 -> 1.1.9 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.7...v1.1.9 --- .../development/python-modules/dask-expr/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 31380317f054..4b9487dfd46b 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -3,12 +3,17 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, versioneer, - wheel, + + # dependencies dask, pandas, pyarrow, + + # checks distributed, pytestCheckHook, xarray @@ -16,7 +21,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.7"; + version = "1.1.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +30,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-3wQhADDS05soZq+oy75eBXIK0JQhochrRmtIqykuvOA="; + hash = "sha256-DfXGQ5/aOIWcM9qcALMr3T6qi/l9gMF9HLaQwbzPdE4="; }; postPatch = '' @@ -36,7 +41,6 @@ buildPythonPackage rec { build-system = [ setuptools versioneer - wheel ]; dependencies = [ From 0995e22ad71a19ef6d7188617bddd71ee86f27c1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 20 Jul 2024 10:58:19 +0200 Subject: [PATCH 3/4] python311Packages.dask-jobqueue: cleaning + fix on darwin --- .../python-modules/dask-jobqueue/default.nix | 52 ++++++++++++------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 9bf5bd2cab78..cfd372a8eb9d 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,34 +1,43 @@ { lib, buildPythonPackage, - cryptography, + pythonOlder, + pythonAtLeast, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies dask, distributed, - docrep, - fetchPypi, + + # checks + cryptography, pytest-asyncio, pytestCheckHook, - pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { pname = "dask-jobqueue"; version = "0.8.5"; - format = "setuptools"; + pyproject = true; # Python 3.12 support should be added in 0.8.6 disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9pI/nX/4lLlu+/cGEYss03/Td1HVZ+kcIt/T4uqpMgI="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-jobqueue"; + rev = "refs/tags/${version}"; + hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dask distributed - docrep ]; nativeCheckInputs = [ @@ -38,17 +47,17 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests have additional requirements (e.g., sge, etc.) - "test_adapt_parameters" + # Require some unavailable pytest fixtures "test_adapt" + "test_adaptive" "test_adaptive_cores_mem" "test_adaptive_grouped" - "test_adaptive" + "test_adapt_parameters" "test_basic" "test_basic_scale_edge_cases" + "test_cluster" "test_cluster_error_scheduler_arguments_should_use_scheduler_options" "test_cluster_has_cores_and_memory" - "test_cluster" "test_command_template" "test_complex_cancel_command" "test_config" @@ -63,12 +72,15 @@ buildPythonPackage rec { "test_forward_ip" "test_import_scheduler_options_from_config" "test_job" + "test_jobqueue_job_call" "test_log_directory" "test_scale_cores_memory" "test_scale_grouped" - "test_scheduler_options_interface" "test_scheduler_options" + "test_scheduler_options_interface" "test_security" + "test_security_temporary" + "test_security_temporary_defaults" "test_shebang_settings" "test_use_stdin" "test_worker_name_uses_cluster_name" @@ -77,10 +89,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_jobqueue" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; }; } From bb257f5529cf2527a0554ae71ac6009f14a64b2e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 20 Jul 2024 10:58:34 +0200 Subject: [PATCH 4/4] python311Packages.dask-jobqueue: add GaetanLepage as maintainer --- pkgs/development/python-modules/dask-jobqueue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index cfd372a8eb9d..55a528499d44 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -95,6 +95,6 @@ buildPythonPackage rec { description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; }