Merge pull request #33557 from NixOS/python-unstable

Python: package updates
2024-12-26 12:53:59 +03:00 · 2018-01-07 10:24:20 +01:00 · 2018-01-07 10:24:20 +01:00 · 4bd2200b81
commit 4bd2200b81
parent aac9c9d337 dceec24705
27 changed files with 80 additions and 76 deletions
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@ -3,7 +3,7 @@

 buildPythonPackage rec {
  pname = "aniso8601";
-  version = "1.3.0";
+  version = "2.0.0";
  name = "${pname}-${version}";

  meta = with stdenv.lib; {
@ -16,6 +16,6 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1";
+    sha256 = "085786415d3550e89785ffbedaa9bb37d41de0707a1268bdbba11249064b71d1";
  };
 }
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/pkgs/development/python-modules/argon2_cffi/default.nix
@ -10,12 +10,12 @@

 buildPythonPackage rec {
  pname = "argon2_cffi";
-  version = "16.3.0";
+  version = "18.1.0";
  name    = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1ap3il3j1pjyprrhpfyhc21izpmhzhfb5s69vlzc65zvd1nj99cr";
+    sha256 = "7e4b75611b73f53012117ad21cdde7a17b32d1e99ff6799f22d827eb83a2a59b";
  };

  propagatedBuildInputs = [ cffi six ];
--- a/pkgs/development/python-modules/backports_lzma/default.nix
+++ b/pkgs/development/python-modules/backports_lzma/default.nix
@ -8,13 +8,13 @@

 buildPythonPackage rec {
  pname = "backports.lzma";
-  version = "0.0.8";
+  version = "0.0.9";

  disabled = isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3";
+    sha256 = "9ba5d94214a79900ee297a594b8e154cd8e4a54d26eb06243c0e2f3ad5286539";
  };

  buildInputs = [ lzma ];
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@ -9,9 +9,9 @@ let
  };
  setuptools_source = fetchPypi {
    pname = "setuptools";
-    version = "38.2.5";
+    version = "38.4.0";
    format = "wheel";
-    sha256 = "bcf0d4f3e2f7890e658db11e218b8643afffb905a0e2f2a7d5a6a3e949bb87e6";
+    sha256 = "155c2ec9fdcc00c3973d966b416e1cf3a1e7ce75f4c09fb760b23f94b935926e";
  };

  # TODO: Shouldn't be necessary anymore for pip > 9.0.1!
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@ -12,11 +12,11 @@
 buildPythonPackage rec {
  name = "${pname}-${version}";
  pname = "botocore";
-  version = "1.8.21";
+  version = "1.8.23";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "e4513a02f68e7efd7494ee56db201d87620218ca879aae361abbb71bcde3aa5f";
+    sha256 = "cc5df29da7c3f523edfc6086e082204b80945b5c73bf82a181018b7f1a5d6975";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@ -23,6 +23,12 @@ buildPythonPackage rec {
  checkInputs = [ nose ];
  propagatedBuildInputs = [ toolz ];

+  # File as accidentally included in release
+  # See https://github.com/pytoolz/cytoolz/issues/116#issuecomment-355770073
+  postPatch = ''
+    rm cytoolz/tests/test_curried_doctests.py
+  '';
+
  # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
  checkPhase = ''
    NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@ -4,11 +4,11 @@
 buildPythonPackage rec {
  pname = "daphne";
  name = "${pname}-${version}";
-  version = "1.3.0";
+  version = "1.4.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1xmmjp21m1w88ljsgnkf6cbzw5nxamh9cfmfgzxffpn4cdmvn96i";
+    sha256 = "302725f223853b05688f28c361e050f8db9568b1ce27340c76272c26b49e6d72";
  };

  buildInputs = [ hypothesis ];
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , mock
 , numpy
@ -8,14 +8,24 @@
 , dateutil
 }:

-buildPythonPackage rec {
-  pname = "datashape";
-  version = "0.5.2";
-  name = "${pname}-${version}";
+let
+  # Fetcher function looks similar to fetchPypi.
+  # Allows for easier overriding, without having to know
+  # how the source is actually fetched.
+  fetcher = {pname, version, sha256}: fetchFromGitHub {
+    owner = "blaze";
+    repo = pname;
+    rev = version;
+    inherit sha256;
+  };

-  src = fetchPypi {
+in buildPythonPackage rec {
+  pname = "datashape";
+  version = "0.5.4";
+
+  src = fetcher {
    inherit pname version;
-    sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783";
+    sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf";
  };

  checkInputs = [ pytest mock ];
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@ -3,12 +3,12 @@

 buildPythonPackage rec {
  pname = "dyn";
-  version = "1.8.0";
+  version = "1.8.1";
  name  = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4ab3cd9a1478674cf2d2aa6740fb0ddf77daaa9ab3e35e5d2bc92f60301f8523";
+    sha256 = "e112149d48b4500c18b3cfb6e0e6e780bb5aa0e56ff87cac412280200b9ec8bf";
  };

  buildInputs = [ glibcLocales ];
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "filelock";
-  version = "2.0.14";
+  version = "3.0.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "ee355eb66e4c2e5d95689e1253515aad5b3177c274abdd00a57d5ab1aa6d071a";
+    sha256 = "b3ad481724adfb2280773edd95ce501e497e88fa4489c6e41e637ab3fd9a456c";
  };

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@ -3,11 +3,11 @@

 buildPythonPackage rec {
  pname = "grpcio";
-  version = "1.8.2";
+  version = "1.8.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1ea1336f0d1158c4e00e96a94df84b75f6bbff9816abb6cc68cbdc9442a9ac55";
+    sha256 = "6ce5fd3093ddc09a152981d5c477ac645eda19dfcc819e45d8c57da6b743bd53";
  };

  propagatedBuildInputs = [ six protobuf ]
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@ -15,11 +15,11 @@

 buildPythonPackage rec {
  pname = "jupyter_client";
-  version = "5.2.0";
+  version = "5.2.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "ca30cf1786047925ebacd6f6faa3a993efaa004b584f7d83bc8b807f7cd3f6bb";
+    sha256 = "462790d46b244f0a631ea5e3cd5cdbad6874d5d24cc0ff512deb7c16cdf8653d";
  };

  checkInputs = [ ipykernel ipython mock pytest ];
@ -29,10 +29,6 @@ buildPythonPackage rec {
    py.test
  '';

-  patches = [
-    ./wheel_workaround.patch
-  ];
-
  # Circular dependency with ipykernel
  doCheck = false;

--- a/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch
+++ b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch
@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 95d4774..ee72cbc 100644
--- a/setup.py
-+++ b/setup.py
-@@ -86,7 +86,7 @@ setup_args = dict(
-     extras_require   = {
-         'test': ['ipykernel', 'ipython', 'mock'],
-         'test:python_version == "3.3"': ['pytest<3.3.0'],
-        'test:python_version >= "3.4" or python_version == "2.7"': ['pytest'],
-+        'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'],
-     },
-     cmdclass         = {
-         'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled,
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@ -1,14 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy,
-  nose, olefile,
-  freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}:
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy
+, olefile
+, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
+, pytestrunner
+, pytest
+}:
 buildPythonPackage rec {
  pname = "Pillow";
-  version = "4.3.0";
+  version = "5.0.0";
  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527";
+    sha256 = "12f29d6c23424f704c66b5b68c02fe0b571504459605cfe36ab8158359b0e1bb";
  };

  doCheck = !stdenv.isDarwin && !isPyPy;
@ -21,8 +24,10 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ olefile ];

+  checkInputs = [ pytest pytestrunner ];
+
  buildInputs = [
-    freetype libjpeg zlib libtiff libwebp tcl nose lcms2 ]
+    freetype libjpeg zlib libtiff libwebp tcl lcms2 ]
    ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];

  # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@ -7,12 +7,12 @@

 buildPythonPackage rec {
  pname = "psutil";
-  version = "5.4.2";
+  version = "5.4.3";
  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "00a1f9ff8d1e035fba7bfdd6977fa8ea7937afdb4477339e5df3dba78194fe11";
+    sha256 = "e2467e9312c2fa191687b89ff4bc2ad8843be4af6fb4dc95a7cc5f7d7a327b18";
  };

  # No tests in archive
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/pkgs/development/python-modules/pwntools/default.nix
@ -5,13 +5,13 @@
 , requests, tox, pandoc, unicorn, intervaltree }:

 buildPythonPackage rec {
-  version = "3.10.0";
+  version = "3.11.0";
  pname = "pwntools";
  name = pname + "-" + version;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk";
+    sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be";
  };

  propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ];
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@ -2,7 +2,7 @@
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k
 }:
 buildPythonPackage rec {
-  version = "3.3.1";
+  version = "3.3.2";
  pname = "pytest";

  preCheck = ''
@ -12,7 +12,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";
+    sha256 = "53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4";
  };

  checkInputs = [ hypothesis ];
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@ -1,14 +1,14 @@
 { lib, fetchurl, buildPythonPackage, isPy3k }:

 buildPythonPackage rec {
-  version = "1.7";
+  version = "1.8.1";
  pname = "python-stdnum";
  name = "${pname}-${version}";
  # Failing tests and dependency issue on Py3k
  disabled = isPy3k;
  src = fetchurl {
    url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
-    sha256 = "987c25e1047e8742131bcf29dac7a406987adb1463465749e2daaba8cb19d264";
+    sha256 = "d7162fdb29337aebed65700cc7297016f6cd32cae4ad7aed8f7e7531f0217943";
  };
  meta = {
    homepage = http://arthurdejong.org/python-stdnum/;
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@ -8,11 +8,11 @@

 buildPythonApplication rec {
  pname = "ropper";
-  version = "1.11.2";
+  version = "1.11.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2183feedfe8b01a27301eee07383b481ece01b2319bdba3afebe33e19ca14aa3";
+    sha256 = "77d9b03083d0a098261a1d2856cd330ea3db520511a78472e421a00526aa220c";
  };
  # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
  # workaround: sudo chmod 777 /dev/shm
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
  pname = "setuptools";
-  version = "38.2.5";
+  version = "38.4.0";
  name = "${python.libPrefix}-${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "b080f276cc868670540b2c03cee06cc14d2faf9da7bec0f15058d1b402c94507";
+    sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75";
  };

  buildInputs = [ python wrapPython unzip ];
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "sqlmap";
-  version = "1.1.12";
+  version = "1.2";
  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "86a1078ceb1e79f891633c7e4c7b07949fd9135a0e4c0738abd5111e2e6b96c0";
+    sha256 = "18ac6392a710f0cc106c28c4e27e43e8f1b25cb46fb8b6714836212607c07b10";
  };

  # No tests in archive
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/pkgs/development/python-modules/texttable/default.nix
@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "texttable";
-  version = "1.1.1";
+  version = "1.2.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "44674d1d470a9fc264c4d1eba44b74463ca0066d7b954453dd5a4f8057779c9c";
+    sha256 = "c89dc0148ae29645917aab7e970a30d1af565b3ca276cef8ab1a60469f0d8100";
  };

  meta = {
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "tornado";
-  version = "4.5.2";
+  version = "4.5.3";
  name = "${pname}-${version}";

  propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ];
@ -23,6 +23,6 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1fb8e494cd46c674d86fac5885a3ff87b0e283937a47d74eb3c02a48c9e89ad0";
+    sha256 = "6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a";
  };
 }
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@ -9,11 +9,11 @@
 buildPythonPackage rec {
  name = "${pname}-${version}";
  pname = "typeguard";
-  version = "2.1.3";
+  version = "2.1.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0l3pih5ca469v7if255h5rqymirsw46bi6s7p885jxhq1gv6cfpk";
+    sha256 = "40b22d18d2215b76b3ddda2564acfbddfa6e702968637fbd969187c2a6fb99da";
  };

  buildInputs = [ setuptools_scm ];
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@ -3,11 +3,11 @@
 buildPythonPackage rec {
  name = "${pname}-${version}";
  pname = "Unidecode";
-  version = "0.04.21";
+  version = "1.0.22";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0lfhp9c5xrbpjvbpr12ji52g1lx04404bzzdg6pvabhzisw6l2i8";
+    sha256 = "8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5";
  };

  LC_ALL="en_US.UTF-8";
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@ -25,13 +25,13 @@

 let
  pname = "zeep";
-  version = "2.4.0";
+  version = "2.5.0";
 in buildPythonPackage {
  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "8631e2735c5f2219eb18ca4f0615ae482455628518508f69c3690dbfb8238aee";
+    sha256 = "4f9db52c7d269813fc6251da4cb050869158858aeea75a055b4550f19e52ac84";
  };

  propagatedBuildInputs = [
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@ -26,12 +26,12 @@ let

 in buildPythonPackage rec {
  pname = "awscli";
-  version = "1.14.17";
+  version = "1.14.19";
  namePrefix = "";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "456499acc41ab67671062a08e218a22aa1a1ff64ae531e694163d0371e8a1dd0";
+    sha256 = "bcb01f4ecdde236a648b94efdd9ca57e59f67c592ba124ca1e45ddf834ce4f5b";
  };

  # No tests included