Merge pull request #120318 from dotlambda/dask-glm-fix

python3Packages.dask*: various improvements
This commit is contained in:
Robert Schütz 2021-05-07 09:55:06 +02:00 committed by GitHub
commit 1c16013bd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions

View file

@ -8,7 +8,7 @@
, setuptools-scm , setuptools-scm
, scipy , scipy
, scikitlearn , scikitlearn
, pytest , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -21,13 +21,9 @@ buildPythonPackage rec {
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ pytest ]; checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];
checkPhase = ''
py.test dask_glm
'';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/dask/dask-glm/"; homepage = "https://github.com/dask/dask-glm/";
description = "Generalized Linear Models with Dask"; description = "Generalized Linear Models with Dask";

View file

@ -26,6 +26,10 @@ buildPythonPackage rec {
sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815";
}; };
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [ propagatedBuildInputs = [
dask dask
dask-glm dask-glm
@ -39,7 +43,6 @@ buildPythonPackage rec {
scipy scipy
six six
toolz toolz
setuptools-scm
]; ];
# has non-standard build from source, and pypi doesn't include tests # has non-standard build from source, and pypi doesn't include tests

View file

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, bokeh , bokeh
, buildPythonPackage , buildPythonPackage
, fetchpatch , fetchpatch
@ -77,9 +78,7 @@ buildPythonPackage rec {
"-m 'not network'" "-m 'not network'"
]; ];
disabledTests = [ disabledTests = lib.optionals stdenv.isDarwin [
"test_annotation_pack_unpack"
"test_annotations_blockwise_unpack"
# this test requires features of python3Packages.psutil that are # this test requires features of python3Packages.psutil that are
# blocked in sandboxed-builds # blocked in sandboxed-builds
"test_auto_blocksize_csv" "test_auto_blocksize_csv"