From 8107b31f86c52b483336e949a7de211a3ee4b92f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 08:05:10 -0800 Subject: [PATCH 1/2] python37Packages.distributed: 1.25.2 -> 1.25.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-distributed/versions --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0ea3a9d8ab4..d2c8c0325ed 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -26,12 +26,12 @@ 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 ]; From 9dd0b54bfb8b0057ca14465801934c4f832c485b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Feb 2019 21:20:29 +0100 Subject: [PATCH 2/2] 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 d2c8c0325ed..29460f14eab 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