From 6e61ecf9bc08c45bc603b6b23dd159a32324b124 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Oct 2022 14:24:15 +0200 Subject: [PATCH 1/6] python3Packages.dask-gateway-server: 2022.4.0 -> 2022.10.0 --- .../dask-gateway-server/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 5ef21c545fa2..5ebc0c57389f 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -5,23 +5,25 @@ , cryptography , fetchFromGitHub , go +, pykerberos , pythonOlder +, skein +, sqlalchemy , traitlets }: buildPythonPackage rec { pname = "dask-gateway-server"; - # update dask-gateway-server lock step with dask-gateway - version = "2022.4.0"; + version = "2022.10.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dask"; repo = "dask-gateway"; rev = version; - hash = "sha256-Grjp7gt3Pos4cQSGV/Rynz6W/zebRI0OqDiWT4cTh8I="; + hash = "sha256-8yyako49F3rK8oZFmpYOiLVg9K3YF76/XerapQx3uhc="; }; sourceRoot = "${src.name}/${pname}"; @@ -37,9 +39,24 @@ buildPythonPackage rec { traitlets ]; + passthru.optional-dependencies = { + kerberos = [ + pykerberos + ]; + jobqueue = [ + sqlalchemy + ]; + local = [ + sqlalchemy + ]; + yarn = [ + skein + sqlalchemy + ]; + }; + preBuild = '' export HOME=$(mktemp -d) - export GO111MODULE=off ''; # Tests requires cluster for testing From 36fa6a8e56da5b877020908c090a6fdcd3bde92f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:30:42 +0200 Subject: [PATCH 2/6] python310Packages.fastparquet: 2023.1.0 -> 2023.4.0 Diff: https://github.com/dask/fastparquet/compare/2023.1.0...2023.4.0 --- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index f0d234390b11..8b421b1716bc 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2023.1.0"; + version = "2023.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-p8JydnrDEl9W4clrOkd+np0NYGP3hVnq+lyyF/zaVk8="; + hash = "sha256-1hWiwXjTgflQlmy0Dk2phUa1cgYBvvH99tb0TdUmDRI="; }; nativeBuildInputs = [ From 298a77d9293d43578626994590ef95596689e372 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:39:11 +0200 Subject: [PATCH 3/6] python310Packages.dask-ml: 2022.5.27 -> 2023.3.24 --- pkgs/development/python-modules/dask-ml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index ee3365955db5..73645bfb8180 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "dask-ml"; - version = "2022.5.27"; + version = "2023.3.24"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Y2nTk0GSvMGSP87oTD+4+8zsoQITeQEHC6Px2eOGzOQ="; + hash = "sha256-lsCQ220yg2U24/Ccpk3rWZ6GRYeqjj1NLGtK9YhzMwc="; }; nativeBuildInputs = [ From b12ad9a53455410ee950cc5735eb3258088542b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 10:13:06 +0200 Subject: [PATCH 4/6] python310Packages.dask: 2023.2.1 -> 2023.4.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- .../python-modules/dask/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index c6e9a1b9eff5..b0e10f29a6ed 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -10,6 +10,7 @@ , fetchFromGitHub , fetchpatch , fsspec +, importlib-metadata , jinja2 , numpy , packaging @@ -22,13 +23,15 @@ , pythonOlder , pyyaml , scipy +, setuptools , toolz +, versioneer , zarr }: buildPythonPackage rec { pname = "dask"; - version = "2023.2.1"; + version = "2023.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,10 +39,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask"; repo = pname; - rev = version; - hash = "sha256-7cuTxJ5SxOEf0v+SvSiaz7x8YYTx/qIS+KktbtubiDU="; + rev = "refs/tags/${version}"; + hash = "sha256-PkEFXF6OFZU+EMFBUopv84WniQghr5Q6757Qx6D5MyE="; }; + nativeBuildInputs = [ + setuptools + versioneer + ]; + propagatedBuildInputs = [ click cloudpickle @@ -47,6 +55,7 @@ buildPythonPackage rec { packaging partd pyyaml + importlib-metadata toolz ]; @@ -91,8 +100,9 @@ buildPythonPackage rec { --replace "version=versioneer.get_version()," "version='${version}'," \ --replace "cmdclass=versioneer.get_cmdclass()," "" - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace " --durations=10" "" \ + --replace " --cov-config=pyproject.toml" "" \ --replace " -v" "" ''; From 1ff212f0fe30a7733ffd1c69e08859da053fda67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 10:17:34 +0200 Subject: [PATCH 5/6] python310Packages.dask-awkward: 2023.1.0 -> 2023.4.2 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2023.1.0...2023.4.2 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2023.4.2 --- .../python-modules/dask-awkward/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 6dd42fcc3c0a..1c6cb7b5bbe5 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,18 +1,19 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder , awkward +, buildPythonPackage , dask +, fetchFromGitHub , hatch-vcs , hatchling , pyarrow , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.1.0"; + version = "2023.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,13 +21,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask-contrib"; repo = pname; - rev = version; - hash = "sha256-q0mBd4yelnNL7rMWfilituo9h/xmLLLndSCBdY2egEQ="; + rev = "refs/tags/${version}"; + hash = "sha256-c3NnARost/406cALQDKmeUsl2kFSQHAswAEwgreFXPc="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonRelaxDeps = [ + "awkward" + ]; + nativeBuildInputs = [ hatch-vcs hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -34,8 +42,6 @@ buildPythonPackage rec { dask ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ pytestCheckHook pyarrow @@ -45,15 +51,16 @@ buildPythonPackage rec { "dask_awkward" ]; - pytestFlagsArray = [ - # require internet - "--deselect=tests/test_parquet.py::test_remote_double" - "--deselect=tests/test_parquet.py::test_remote_single" + disabledTests = [ + # Tests require network access + "test_remote_double" + "test_remote_single" ]; meta = with lib; { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; + changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; From d15f5daf89123628704cfe98f29195ee8614cdb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 May 2023 12:59:49 +0200 Subject: [PATCH 6/6] python310Packages.distributed: 2023.2.1 -> 2023.4.1 Changelog: https://github.com/dask/distributed/blob/2023.4.1/docs/source/changelog.rst --- .../python-modules/distributed/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 78d6d87832f6..be2fb48ea8d8 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -3,7 +3,7 @@ , click , cloudpickle , dask -, fetchPypi +, fetchFromGitHub , jinja2 , locket , msgpack @@ -11,31 +11,43 @@ , psutil , pythonOlder , pyyaml +, setuptools +, setuptools-scm , sortedcontainers , tblib , toolz , tornado , urllib3 +, versioneer +, wheel , zict }: buildPythonPackage rec { pname = "distributed"; - version = "2023.2.1"; - format = "setuptools"; + version = "2023.4.1"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-E0eks6HlJzZy/XqHRxQJ4brEcLS9tniMkYMT1FoikRs="; + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-KCgftu3i8N0WSelHiqWqa1vLN5gUtleftSUx1Zu4nZg="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "tornado >= 6.0.3, <6.2" "tornado >= 6.0.3" + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; + nativeBuildInputs = [ + setuptools + setuptools-scm + versioneer + ]; + propagatedBuildInputs = [ click cloudpickle @@ -64,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed computation in Python"; homepage = "https://distributed.readthedocs.io/"; + changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ teh costrouc ]; };