From 9dd0b54bfb8b0057ca14465801934c4f832c485b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Feb 2019 21:20:29 +0100 Subject: [PATCH] pythonPackages.distributed: add missing dependencies Added `mpi4py` and `bokeh` to get the executables working. Also simplified the `lib.optional` expression as Python 3.2 and 3.4 aren't supported anymore. Rather than referencing unsupported Python 3.x versions it's far more obvious now to only use `futures` and `singledispatch` if Python2 is used. --- pkgs/development/python-modules/distributed/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index d2c8c0325ed9..29460f14eab3 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,9 +19,11 @@ , tornado , zict , pyyaml -, pythonOlder +, isPy3k , futures , singledispatch +, mpi4py +, bokeh }: buildPythonPackage rec { @@ -37,9 +39,8 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml - ] ++ lib.optional (pythonOlder "3.2") [ futures ] - ++ lib.optional (pythonOlder "3.4") [ singledispatch ]; + sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses