From ed898bf0f408be6afc100ebdaf98db11908a7c26 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 8 Aug 2019 17:45:34 -0700 Subject: [PATCH 1/3] dask: disable the package for Python older than 3.5 --- pkgs/development/python-modules/dask/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index cd38c8f137c5..5ae749f93736 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytest +, pythonOlder , cloudpickle , numpy , toolz @@ -14,6 +15,8 @@ buildPythonPackage rec { pname = "dask"; version = "1.2.2"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; sha256 = "5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c"; From cfb84a0ee64a64c3ab3476c0ac3fc9e8174be666 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 8 Aug 2019 17:46:01 -0700 Subject: [PATCH 2/3] pythonPackages.fsspec: init at 0.4.1 --- .../python-modules/fsspec/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/fsspec/default.nix diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix new file mode 100644 index 000000000000..8f4b9cf8c890 --- /dev/null +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fsspec"; + version = "0.4.1"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fvm1kdnnbf0pppv23mlfdqh220gcldmv72w2rdxp6ks1rcphzg3"; + }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A specification that python filesystems should adhere to."; + homepage = "https://github.com/intake/filesystem_spec"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b89401cb958..a89c4bf837b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -579,6 +579,8 @@ in { filemagic = callPackage ../development/python-modules/filemagic { }; + fsspec = callPackage ../development/python-modules/fsspec { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; From c9d4a6963a3f4c41df7433b108c56771dc37efc5 Mon Sep 17 00:00:00 2001 From: Piero Cinquegrana Date: Thu, 8 Aug 2019 14:09:40 -0700 Subject: [PATCH 3/3] pythonPackages.dask: 1.2.2 -> 2.2.0 --- pkgs/development/python-modules/dask/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 5ae749f93736..ba8c06f73f2e 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,6 +1,8 @@ { lib +, bokeh , buildPythonPackage , fetchPypi +, fsspec , pytest , pythonOlder , cloudpickle @@ -13,17 +15,18 @@ buildPythonPackage rec { pname = "dask"; - version = "1.2.2"; + version = "2.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c"; + sha256 = "0wkiqkckwy7fv6m86cs3m3g6jdikkkw84ki9hiwp60xpk5xngnf0"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cloudpickle numpy toolz dill pandas partd ]; + propagatedBuildInputs = [ + bokeh cloudpickle dill fsspec numpy pandas partd toolz ]; checkPhase = '' py.test dask