From 0660e869722f33ac34e075fed9d110fe4cfefdbf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 May 2024 22:39:45 +0200 Subject: [PATCH 1/4] python311Packages.dask: 2024.5.0 -> 2024.5.1 Diff: https://github.com/dask/dask/compare/refs/tags/2024.5.0...2024.5.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 8de709f446c9..7cbd6be946e0 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -39,7 +39,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.5.0"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,15 +48,15 @@ let self = buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-2tkY02Inhpo8upTjhen//EvsZwd93roPCID215NOxwQ="; + hash = "sha256-FzvzmQa9kJAZw67HY+d+3uC6Bd246vp5QsyXepGnKH8="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ click cloudpickle fsspec @@ -185,12 +185,12 @@ let self = buildPythonPackage rec { }; - meta = with lib; { + meta = { description = "Minimal task scheduling abstraction"; mainProgram = "dask"; homepage = "https://dask.org/"; changelog = "https://docs.dask.org/en/latest/changelog.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; }; in self From 4dc443067572c9e4305fd5d9d37f0ea2fcf7cbd9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 May 2024 23:20:24 +0200 Subject: [PATCH 2/4] python311Packages.dask-expr: 1.1.0 -> 1.1.1 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.0...v1.1.1 --- .../python-modules/dask-expr/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 657d588931e7..457a2b5ddf33 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-yVwaOOjxHVxAhFlEENnjpX8LbJs9MW0OOmwAH5RhPgE="; + hash = "sha256-ltsRKbb/p+qHeNiX0oeZUKbbjPoPxSM4uFnWUFqoqhc="; }; postPatch = '' @@ -32,13 +32,13 @@ buildPythonPackage rec { --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" ''; - nativeBuildInputs = [ + build-system = [ setuptools versioneer wheel ]; - propagatedBuildInputs = [ + dependencies = [ dask pandas pyarrow @@ -53,10 +53,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { - description = ""; + meta = { + description = "A rewrite of Dask DataFrame that includes query optimization and generally improved organization"; homepage = "https://github.com/dask/dask-expr"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From f6663cf2876b161a00498a406e70205f1f9d8ef2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 May 2024 23:27:02 +0200 Subject: [PATCH 3/4] python311Packages.dask-image: 2023.8.1 -> 2024.5.1 Changelog: https://github.com/dask/dask-image/releases/tag/v2024.5.1 --- .../python-modules/dask-image/default.nix | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 92c0e9074603..3fe0f4639f91 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,32 +1,42 @@ { lib -, stdenv , buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, setuptools-scm , dask -, fetchPypi , numpy +, scipy +, pandas , pims , pytestCheckHook -, pythonOlder , scikit-image -, scipy }: buildPythonPackage rec { pname = "dask-image"; - version = "2023.8.1"; - format = "setuptools"; + version = "2024.5.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-XpqJhbBSehtZQsan50Tg5X0mTiIscFjwW664HDdNBLY="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-BNjftLs/hle2EWkLBOT8r2nSOxKZzPixAE4fOfNSFIs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ dask numpy scipy + pandas pims ]; @@ -35,19 +45,14 @@ buildPythonPackage rec { scikit-image ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--flake8" "" - ''; - pythonImportsCheck = [ "dask_image" ]; - meta = with lib; { + meta = { description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ ]; }; } From 030bcbc7ef1403e89f4877584979ca214f33386e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 May 2024 23:42:59 +0200 Subject: [PATCH 4/4] python311Packages.dask-image: add GaetanLepage as maintainer --- pkgs/development/python-modules/dask-image/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 3fe0f4639f91..311d889929dd 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; }