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.
This commit is contained in:
Maximilian Bosch
2019-02-07 21:30:14 +01:00
parent 8107b31f86
commit 9dd0b54bfb
@@ -19,9 +19,11 @@
, tornado , tornado
, zict , zict
, pyyaml , pyyaml
, pythonOlder , isPy3k
, futures , futures
, singledispatch , singledispatch
, mpi4py
, bokeh
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@@ -37,9 +39,8 @@ buildPythonPackage rec {
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
propagatedBuildInputs = [ propagatedBuildInputs = [
click cloudpickle dask msgpack psutil six click cloudpickle dask msgpack psutil six
sortedcontainers tblib toolz tornado zict pyyaml sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh
] ++ lib.optional (pythonOlder "3.2") [ futures ] ] ++ lib.optionals (!isPy3k) [ futures singledispatch ];
++ lib.optional (pythonOlder "3.4") [ singledispatch ];
# tests take about 10-15 minutes # tests take about 10-15 minutes
# ignore 5 cli tests out of 1000 total tests that fail due to subprocesses # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses