From 7e55392a4f806edee933b63b3e7905f20b73c3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 10:53:37 +0200 Subject: [PATCH 1/3] python3Packages.dask-glm: use pytestCheckHook --- pkgs/development/python-modules/dask-glm/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index ca25e05bb1e..d091785db11 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -8,7 +8,7 @@ , setuptools-scm , scipy , scikitlearn -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -21,13 +21,9 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; - checkPhase = '' - py.test dask_glm - ''; - meta = with lib; { homepage = "https://github.com/dask/dask-glm/"; description = "Generalized Linear Models with Dask"; From 0e54200b06d55a6a5cd7b30be6fb4f5fe2ee461c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 11:25:19 +0200 Subject: [PATCH 2/3] python3Packages.dask-ml: setuptools-scm should be in nativeBuildInputs --- pkgs/development/python-modules/dask-ml/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 517056866bb..b02c9a71a6b 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dask dask-glm @@ -39,7 +43,6 @@ buildPythonPackage rec { scipy six toolz - setuptools-scm ]; # has non-standard build from source, and pypi doesn't include tests From acffa671a949ae68296b48785112272ec8a772cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 27 Apr 2021 09:38:15 +0200 Subject: [PATCH 3/3] python3Packages.dask: remove superfluous disabledTests --- pkgs/development/python-modules/dask/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 1c6d37681a6..55ba3ad6ba7 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , bokeh , buildPythonPackage , fetchpatch @@ -77,9 +78,7 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = [ - "test_annotation_pack_unpack" - "test_annotations_blockwise_unpack" + disabledTests = lib.optionals stdenv.isDarwin [ # this test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv"