From 462b6c2826424c1db71af17f3a6160d629cb5480 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Nov 2022 15:28:22 +0100 Subject: [PATCH 1/4] python3Packages.dask: 2022.9.1 -> 2022.10.2 https://github.com/dask/dask/blob/main/docs/source/changelog.rst#2022102 --- .../python-modules/dask/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 8502c01956ec..e8682d020669 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,6 +2,7 @@ , stdenv , bokeh , buildPythonPackage +, click , cloudpickle , distributed , fastparquet @@ -26,19 +27,28 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.9.1"; + version = "2022.10.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-4Tok9eYhi2FF+8bpKnwKT3KIRGHIMtxczTkZ6qD8x7g="; + hash = "sha256-zHJR2WjHigUMWtRJW25+gk1fKGKedU53BBjwx5zaodA="; }; + patches = [ + (fetchpatch { + # Fix test_repartition_npartitions on platforms other than x86-64 + url = "https://github.com/dask/dask/commit/65f40ad461c57065f981e6213e33b1d13cc9bc8f.patch"; + hash = "sha256-KyTSms4ik1kYtL+I/huAxD+zK2AAuPkwmHA9FYk601Y="; + }) + ]; + propagatedBuildInputs = [ + click cloudpickle fsspec packaging @@ -109,6 +119,8 @@ buildPythonPackage rec { "test_read_dir_nometa" ] ++ [ "test_chunksize_files" + # TypeError: 'ArrowStringArray' with dtype string does not support reduction 'min' + "test_set_index_string" ]; __darwinAllowLocalNetworking = true; From e28e2a76b704e7dc0b0c6ae003de2333827bd851 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Nov 2022 15:38:54 +0100 Subject: [PATCH 2/4] python3Packages.threadpoolctl: disable failing tests More tests are failing with mismatching thread count (64 != 80) on our aarch64-linux builders. --- pkgs/development/python-modules/threadpoolctl/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index c55bb1085309..5316c90c5d15 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -33,10 +33,14 @@ buildPythonPackage rec { # developers' hardware "test_architecture" # https://github.com/joblib/threadpoolctl/issues/128 - "test_threadpool_limits_by_prefix" - "test_controller_info_actualized" "test_command_line_command_flag" "test_command_line_import_flag" + "test_controller_info_actualized" + "test_set_threadpool_limits_by_api" + "test_set_threadpool_limits_no_limit" + "test_threadpool_limits_by_prefix" + "test_threadpool_limits_function_with_side_effect" + "test_threadpool_limits_manual_restore" ]; pythonImportsCheck = [ From 654375b618dc408622f92845404211420d903b20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Nov 2022 15:40:57 +0100 Subject: [PATCH 3/4] python3Packages.distributed: 2022.9.1 -> 2022.10.2 https://github.com/dask/distributed/blob/2022.10.2/docs/source/changelog.rst --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0b9236feeb00..6b7f535e5152 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.9.1"; + version = "2022.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-upj1TipRhhvulyuhX4bfbQSWar9m7Xu3mIsi48G+ewE="; + hash = "sha256-U/Clv276uaWrM0XNkT9tPz1OpETuLtvqMxx/75b9Z9A="; }; postPatch = '' From 0cd89bba2bf7ad48d186ca6e81867d3c03a38057 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Nov 2022 16:38:40 +0100 Subject: [PATCH 4/4] python3Packages.dask-glm: disable failing tests Some times require the `loop_in_thread` fixture that for some reason isn't available anymore. There are indiciations that it can be imported from another location after distributed>=2022.8.0, but the dask-glm upstream is not very active anymore. --- pkgs/development/python-modules/dask-glm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index bd9b468064dd..d0c7b128bc09 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -54,6 +54,11 @@ buildPythonPackage rec { "dask_glm/tests/test_utils.py" ]; + disabledTests = [ + # missing fixture with distributed>=2022.8.0 + "test_determinism_distributed" + ]; + meta = with lib; { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/";