From 6b6bba486e4e3c5f9ac90a79e27b029699b4f784 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:01:25 +0100 Subject: [PATCH 1/7] cloudpickle: 0.1.1 -> 0.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b5f1a10d36..ef654966f46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3319,11 +3319,11 @@ in modules // { cloudpickle = buildPythonPackage rec { name = "cloudpickle-${version}"; - version = "0.1.1"; + version = "0.2.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; - sha256 = "3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74"; + sha256 = "0fsw28nmzrpk0g02y84d7pigkqr64a3x2jhhkfixplxfwravd97f"; }; buildInputs = with self; [ pytest mock ]; From 5b782924c1dc9d66d7aefaf99650ff52119b6358 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:03:34 +0100 Subject: [PATCH 2/7] tornado: disable tests, see #14634 --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef654966f46..342ad3a1a44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23893,6 +23893,10 @@ in modules // { propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + # Tests fail: + # ValueError: _type_ 'v' not supported + # See https://github.com/NixOS/nixpkgs/issues/14634 + doCheck = false; src = pkgs.fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; sha256 = "a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969"; From d2c6b93892af58ffa0018090747ccb2a7fff91e7 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:01:52 +0100 Subject: [PATCH 3/7] dask: 0.7.6 -> 0.9.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 342ad3a1a44..fd6863688ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4584,15 +4584,15 @@ in modules // { dask = buildPythonPackage rec { name = "dask-${version}"; - version = "0.7.6"; + version = "0.9.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/dask/${name}.tar.gz"; - sha256 = "ff27419e059715907afefe6cbcc1f8c748855c7a93be25be211dabcb689cee3b"; + sha256 = "1jm6riz6fbbd554i0dg0w1xfcmx3f9ryp4jrlavsy4zambilm6b3"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [numpy toolz dill pandas ]; + propagatedBuildInputs = with self; [ numpy toolz dill pandas ]; checkPhase = '' py.test dask From dacbeea15b75d624fe08949e688b8df6c9b64674 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:02:14 +0100 Subject: [PATCH 4/7] locket: init at 0.2.0 --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 19f9300fe5d..80f5cf3876d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -353,6 +353,7 @@ tailhook = "Paul Colomiets "; taktoa = "Remy Goldschmidt "; tavyc = "Octavian Cerna "; + teh = "Tom Hunger "; telotortium = "Robert Irelan "; thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd6863688ba..2dcbd23723c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4609,6 +4609,29 @@ in modules // { }; }; + locket = buildPythonPackage rec { + name = "locket-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/l/locket/${name}.tar.gz"; + sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; + }; + + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ ]; + + # weird test requirements (spur.local>=0.3.7,<0.4) + doCheck = false; + + meta = { + description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; + homepage = "https://github.com/mwilliamson/locket.py"; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; + }; + datashape = buildPythonPackage rec { name = "datashape-${version}"; version = "0.5.1"; From b42226732e78d6dcf7e62777800971e93562023c Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:02:35 +0100 Subject: [PATCH 5/7] s3fs: init at 0.0.4 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dcbd23723c..0e45ff5d9d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4632,6 +4632,31 @@ in modules // { }; }; + s3fs = buildPythonPackage rec { + name = "s3fs-${version}"; + version = "0.0.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/s3fs/${name}.tar.gz"; + sha256 = "0gxs9zf0j97liby038i89k5njfrpvdgw0jw34ghzvlp1nzbwxwzl"; + }; + + buildInputs = with self; [ docutils ]; + propagatedBuildInputs = with self; [ boto3 ]; + + # Depends on `moto` which has a long dependency chain with exact + # version requirements that can't be made to work with current + # pythonPackages. + doCheck = false; + + meta = { + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + homepage = "http://github.com/dask/s3fs/"; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; + }; + datashape = buildPythonPackage rec { name = "datashape-${version}"; version = "0.5.1"; From d25a6b0eb39a4a92b1763bd6c9863e589d5e90dc Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:02:54 +0100 Subject: [PATCH 6/7] tblib: init at 1.3.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e45ff5d9d2..6035798e5c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4632,6 +4632,23 @@ in modules // { }; }; + tblib = buildPythonPackage rec { + name = "tblib-${version}"; + version = "1.3.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/t/tblib/${name}.tar.gz"; + sha256 = "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"; + }; + + meta = { + description = "Traceback fiddling library. Allows you to pickle tracebacks."; + homepage = "https://github.com/ionelmc/python-tblib"; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; + }; + s3fs = buildPythonPackage rec { name = "s3fs-${version}"; version = "0.0.4"; From 3c600a45153a274a5d65751595b414cc73f0990f Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:03:11 +0100 Subject: [PATCH 7/7] distributed: init at 1.10.0 --- pkgs/top-level/python-packages.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6035798e5c8..cb78e00066f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4609,6 +4609,34 @@ in modules // { }; }; + distributed = buildPythonPackage rec { + + name = "distributed-${version}"; + version = "1.10.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/distributed/${name}.tar.gz"; + sha256 = "11bp2rs52fhcqlgyrlh3cf31ck07mys38mrkf98vjl380lyjj357"; + }; + + buildInputs = with self; [ pytest docutils ]; + propagatedBuildInputs = with self; [ + dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado + psutil botocore + ] ++ (if !isPy3k then [ singledispatch ] else []); + + checkPhase = '' + py.test -m "not avoid_travis" distributed --verbose + ''; + + meta = { + description = "Distributed computation in Python."; + homepage = "http://distributed.readthedocs.io/en/latest/"; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; + }; + locket = buildPythonPackage rec { name = "locket-${version}"; version = "0.2.0";