about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/distributed
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-02-10 20:13:39 +0000
committerAlyssa Ross <hi@alyssa.is>2019-02-10 20:13:39 +0000
commit393251bf8fa98292cecd05785a8c815fa762b3ea (patch)
treeab59dcf3808e5a222c2501b51b636d876844e5d0 /nixpkgs/pkgs/development/python-modules/distributed
parent0e118743ce5edf9174a320050a7c0eea2199aaaa (diff)
parent929cc78363e6878e044556bd291382eab37bcbed (diff)
downloadnixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar
nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.gz
nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.bz2
nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.lz
nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.xz
nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.zst
nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.zip
Merge commit '929cc78363e6878e044556bd291382eab37bcbed'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/distributed')
-rw-r--r--nixpkgs/pkgs/development/python-modules/distributed/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix
index 0ea3a9d8ab4d..29460f14eab3 100644
--- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix
@@ -19,27 +19,28 @@
 , tornado
 , zict
 , pyyaml
-, pythonOlder
+, isPy3k
 , futures
 , singledispatch
+, mpi4py
+, bokeh
 }:
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "1.25.2";
+  version = "1.25.3";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rv5831xv5byx0f8ly3mlji207nb3bzq6qmdf7ishrgy9kpphc68";
+    sha256 = "0bvjlw74n0l4rgzhm876f66f7y6j09744i5h3iwlng2jwzyw97gs";
   };
 
   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