diff options
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 147 |
1 files changed, 53 insertions, 94 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c9f43c2870..aee320cea1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -923,79 +923,11 @@ in { }; }; - ansible = buildPythonPackage rec { - version = "1.9.6"; - name = "ansible-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "0pgfh5z4w44sjgd77q6k769a5ipigjlm28zbpf2jhvz7n60kfxsh"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - windowsSupport = true; + ansible = self.ansible2; + ansible2 = self.ansible_2_2; - propagatedBuildInputs = with self; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six - netaddr dns - ] ++ optional windowsSupport pywinrm; - - meta = { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = with licenses; [ gpl3] ; - maintainers = with maintainers; [ - jgeerds - joamaki - ]; - platforms = with platforms; linux ++ darwin; - }; - }; - - ansible2 = buildPythonPackage rec { - version = "2.2.0.0"; - name = "ansible-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "11l5814inr44ammp0sh304rqx2382fr629c0pbwf0k1rjg99iwfr"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - windowsSupport = true; - - propagatedBuildInputs = with self; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six - netaddr dns - ] ++ optional windowsSupport pywinrm; - - meta = with stdenv.lib; { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ - copumpkin - jgeerds - ]; - platforms = with platforms; linux ++ darwin; - }; - }; + ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {}; + ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {}; apipkg = buildPythonPackage rec { name = "apipkg-1.4"; @@ -3959,11 +3891,11 @@ in { cloudpickle = buildPythonPackage rec { name = "cloudpickle-${version}"; - version = "0.2.1"; + version = "0.2.2"; src = pkgs.fetchurl { url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; - sha256 = "0fsw28nmzrpk0g02y84d7pigkqr64a3x2jhhkfixplxfwravd97f"; + sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx"; }; buildInputs = with self; [ pytest mock ]; @@ -5498,11 +5430,11 @@ in { dask = buildPythonPackage rec { name = "dask-${version}"; - version = "0.11.0"; + version = "0.13.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/dask/${name}.tar.gz"; - sha256 = "ef32490c0b156584a71576dccec4dfe550a0cd81a9c131a4ee2e43c241b601c3"; + sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs"; }; buildInputs = with self; [ pytest ]; @@ -5561,13 +5493,14 @@ in { zict = buildPythonPackage rec { name = "zict-${version}"; - version = "0.0.3"; + version = "0.1.1"; src = pkgs.fetchurl { url = "mirror://pypi/z/zict/${name}.tar.gz"; - sha256 = "1xsrlzrih0qmxvxqhk2c5vhzxirf509fppzdfyardl50jpsllni6"; + sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4"; }; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ heapdict ]; meta = { @@ -5581,17 +5514,17 @@ in { distributed = buildPythonPackage rec { name = "distributed-${version}"; - version = "1.13.3"; + version = "1.15.1"; src = pkgs.fetchurl { url = "mirror://pypi/d/distributed/${name}.tar.gz"; - sha256 = "0nka6hqz986j1fhvfmxffgvmnxh66giq9a3ml58jsaf0riq9mjrc"; + sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6"; }; buildInputs = with self; [ pytest docutils ]; propagatedBuildInputs = with self; [ dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado - psutil botocore zict lz4 + psutil botocore zict lz4 sortedcollections sortedcontainers ] ++ (if !isPy3k then [ singledispatch ] else []); # py.test not picking up local config file, even when running @@ -5692,11 +5625,11 @@ in { s3fs = buildPythonPackage rec { name = "s3fs-${version}"; - version = "0.0.4"; + version = "0.0.8"; src = pkgs.fetchurl { url = "mirror://pypi/s/s3fs/${name}.tar.gz"; - sha256 = "0gxs9zf0j97liby038i89k5njfrpvdgw0jw34ghzvlp1nzbwxwzl"; + sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8"; }; buildInputs = with self; [ docutils ]; @@ -14678,6 +14611,26 @@ in { }; }; + sortedcollections = buildPythonPackage rec { + name = "sortedcollections-${version}"; + version = "0.4.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sortedcollections/${name}.tar.gz"; + sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa"; + }; + buildInputs = [ self.sortedcontainers ]; + + # wants to test all python versions with tox: + doCheck = false; + + meta = { + description = "Python Sorted Collections"; + homepage = http://www.grantjenks.com/docs/sortedcollections/; + license = licenses.asl20; + }; + }; + hyperframe = buildPythonPackage rec { name = "hyperframe-${version}"; version = "4.0.1"; @@ -18131,11 +18084,11 @@ in { partd = buildPythonPackage rec { name = "partd-${version}"; - version = "0.3.6"; + version = "0.3.7"; src = pkgs.fetchurl { url = "mirror://pypi/p/partd/${name}.tar.gz"; - sha256 = "1wl8kifdljnpbz0ls7mbbc9j23fc5xzm639im7h88spyg02w68hm"; + sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx"; }; buildInputs = with self; [ pytest ]; @@ -18218,17 +18171,21 @@ in { }; paste = buildPythonPackage rec { - name = "paste-1.7.5.1"; - disabled = isPy3k; + name = "paste-${version}"; + version = "2.0.3"; src = pkgs.fetchurl { - url = mirror://pypi/P/Paste/Paste-1.7.5.1.tar.gz; - sha256 = "11645842ba8ec986ae8cfbe4c6cacff5c35f0f4527abf4f5581ae8b4ad49c0b6"; + url = "mirror://pypi/P/Paste/Paste-${version}.tar.gz"; + sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3"; }; - buildInputs = with self; [ nose ]; + checkInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ six ]; - doCheck = false; # some files required by the test seem to be missing + # Certain tests require network + checkPhase = '' + NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests + ''; meta = { description = "Tools for using a Web Server Gateway Interface stack"; @@ -18266,7 +18223,7 @@ in { doCheck = false; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paste PasteDeploy cheetah argparse ]; + propagatedBuildInputs = with self; [ six paste PasteDeploy cheetah argparse ]; meta = { description = "A pluggable command-line frontend, including commands to setup package file layouts"; @@ -25700,16 +25657,18 @@ in { toolz = buildPythonPackage rec{ name = "toolz-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = pkgs.fetchurl{ url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; + sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; }; buildInputs = with self; [ nose ]; checkPhase = '' + # https://github.com/pytoolz/toolz/issues/357 + rm toolz/tests/test_serialization.py nosetests toolz/tests ''; |