From ce2f0087425742403e588b6d802dd769becf7436 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 00:42:41 +0100 Subject: [PATCH 1/6] python312Packages.distributed: 2024.11.2 -> 2024.12.1 Diff: https://github.com/dask/distributed/compare/refs/tags/2024.11.2...2024.12.1 Changelog: https://github.com/dask/distributed/releases/tag/2024.12.1 --- pkgs/development/python-modules/distributed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 4103bf1d0582..79048685d00d 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.11.2"; + version = "2024.12.1"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; - rev = "refs/tags/${version}"; - hash = "sha256-V+SObUbzrfSI6h5HinyzvffsbcjvXZ8IZss67qIwxKM="; + tag = version; + hash = "sha256-R8DTiatme99afA6enTpC3AFN0KRmDbd+VGpXRNqvE8w="; }; postPatch = '' From ca78c3e4d9fe4b232a4b28f05094cbc21cae3e9f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 00:44:32 +0100 Subject: [PATCH 2/6] python312Packages.dask-expr: 1.1.19 -> 1.1.21 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.19...v1.1.21 --- pkgs/development/python-modules/dask-expr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 5c09c76daccb..88a7bf8a79dc 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,19 +15,19 @@ # checks distributed, pytestCheckHook, - xarray + xarray, }: buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.19"; + version = "1.1.21"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; - rev = "refs/tags/v${version}"; - hash = "sha256-Uze6YxNEuy5izx4tqORgCjD+ItH9Hf1vrbXU7fn4o1M="; + tag = "v${version}"; + hash = "sha256-WvPdvsKorEnHqf+q26+0VbAEriv6CI1UsNhYPRcMu+A="; }; postPatch = '' From d415f31d80b14f0c7658edaa4fce9f1004f8d8c4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 00:44:57 +0100 Subject: [PATCH 3/6] python312Packages.dask: 2024.11.2 -> 2024.12.1 Diff: https://github.com/dask/dask/compare/refs/tags/2024.11.2...2024.12.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- .../python-modules/dask/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 21a4324be797..93b38b11b1f7 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.11.2"; + version = "2024.12.1"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; - rev = "refs/tags/${version}"; - hash = "sha256-mAdjsfXzHGJ37m4nQbi+A+4qrL/CHcQNuoGaeU9Nwwo="; + tag = version; + hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4="; }; build-system = [ setuptools ]; @@ -64,10 +64,15 @@ let optional-dependencies = lib.fix (self: { array = [ numpy ]; - complete = [ - pyarrow - lz4 - ] ++ self.array ++ self.dataframe ++ self.distributed ++ self.diagnostics; + complete = + [ + pyarrow + lz4 + ] + ++ self.array + ++ self.dataframe + ++ self.distributed + ++ self.diagnostics; dataframe = [ # dask-expr -> circular dependency with dask-expr numpy From 1040b139eef8b696a2db1e804416c2e39dae4b8f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 12 Dec 2024 23:52:03 +0100 Subject: [PATCH 4/6] python312Packages.dask-awkward: 2024.9.0 -> 2024.12.2 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.9.0...2024.12.2 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2024.12.2 --- .../python-modules/dask-awkward/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 18bf0952ca2b..a0d8b63fe06a 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.9.0"; + version = "2024.12.2"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; - rev = "refs/tags/${version}"; - hash = "sha256-4CwixPj0bJHVjnwZ7fPkRdiDHs8/IzvNlwSPynXvcAo="; + tag = version; + hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s="; }; build-system = [ @@ -75,12 +75,18 @@ buildPythonPackage rec { "test_distance_behavior" ]; + disabledTestPaths = [ + # TypeError: Blockwise.__init__() got an unexpected keyword argument 'dsk' + # https://github.com/dask-contrib/dask-awkward/issues/557 + "tests/test_str.py" + ]; + __darwinAllowLocalNetworking = true; meta = { 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}"; + changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; From 21789e5defb80239f0837abeede1114700432708 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 17 Dec 2024 22:36:40 +0100 Subject: [PATCH 5/6] python312Packages.dask-histogram: 2024.9.1 -> 2024.12.0 Diff: https://github.com/dask-contrib/dask-histogram/compare/refs/tags/2024.9.1...2024.12.0 Changelog: https://github.com/dask-contrib/dask-histogram/releases/tag/2024.12.0 --- .../development/python-modules/dask-histogram/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 032f978cdef9..fc6af4c39c6b 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.9.1"; + version = "2024.12.1"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; - rev = "refs/tags/${version}"; - hash = "sha256-k+hD5y9K6Jsm++H+IAWJ/Z3wlCN4fV8RIcyAnvOvem0="; + tag = version; + hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ="; }; build-system = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; - changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; + changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ veprbl ]; }; From 434bed5e15909369ce8a5f5b4d52cdebfb932094 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 19 Dec 2024 16:28:01 +0100 Subject: [PATCH 6/6] python312Packages.eliot: disable failing tests --- pkgs/development/python-modules/eliot/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index fedbca7e913b..0904882f0d3e 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -65,6 +65,14 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + disabledTests = [ + # Fails since dask's bump to 2024.12.2 + # Reported upstream: https://github.com/itamarst/eliot/issues/507 + "test_compute_logging" + "test_future" + "test_persist_logging" + ]; + meta = { homepage = "https://eliot.readthedocs.io"; description = "Logging library that tells you why it happened";