Merge remote-tracking branch 'upstream/master' into staging

pkgs/development/python-modules/alot/default.nix

@@ -7,16 +7,16 @@
 
 buildPythonPackage rec {
   pname = "alot";
-  version = "0.7";
+  version = "0.8";
   outputs = [ "out" ] ++ lib.optional withManpage "man";
 
-  disabled = isPy3k;
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "alot";
     rev = "${version}";
-    sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi";
+    sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9";
   };
 
   nativeBuildInputs = lib.optional withManpage sphinx;

pkgs/development/python-modules/approvaltests/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }:
+
+buildPythonPackage rec {
+  version = "0.2.4";
+  pname = "approvaltests";
+
+  # no tests included in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "approvals";
+    repo = "ApprovalTests.Python";
+    rev = version;
+    sha256 = "05lj5i13zpkgw1wdc1v81wj4zqj8bpzqiwycdnwlg08azcy7k7j1";
+  };
+
+  propagatedBuildInputs = [ pyperclip ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pyperclip==1.5.27" "pyperclip>=1.5.27"
+  '';
+
+  # Tests fail on Python 3.7
+  # https://github.com/approvals/ApprovalTests.Python/issues/36
+  doCheck = !isPy37;
+
+  # Disable Linux failing test, because tries to use darwin/windows specific reporters
+  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+    substituteInPlace tests/test_genericdiffreporter.py \
+      --replace "test_find_working_reporter" "_find_working_reporter"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Assertion/verification library to aid testing";
+    homepage = https://github.com/approvals/ApprovalTests.Python;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}

pkgs/development/python-modules/astropy/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "3.0.5";
+  version = "3.1";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xldn6mh97pnkq915bacj8my9gy2kx58rrdm44496qla5i1gzlc2";
+    sha256 = "1ldmdwfp0g8293k4gyp962nv7ik4zw83p1khkq8jqkzmk7qf040y";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

pkgs/development/python-modules/billiard/default.nix

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "billiard";
-  version = "3.5.0.4";
+  version = "3.5.0.5";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84";
+    sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2";
   };
 
   buildInputs = [ pytest case ];

pkgs/development/python-modules/cchardet/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "cchardet";
+  version = "2.1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1h3wajwwgqpyb1q44lzr8djbcwr4y8cphph7kyscz90d83h4b5yc";
+  };
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    ${python.interpreter} setup.py nosetests
+  '';
+
+  meta = {
+    description = "High-speed universal character encoding detector";
+    homepage = https://github.com/PyYoshi/cChardet;
+    license = lib.licenses.mpl11;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}

pkgs/development/python-modules/cftime/default.nix

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.0.2.1";
+  version = "1.0.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fxpvy3z0b3ga8ylr54ml7nxsfah2bh5azk43nb565rcka3x909c";
+    sha256 = "0362dhxbzk593walyjz30dll6y2y79wialik647cbwdsf3ad0x6x";
   };
 
   checkInputs = [ pytest coveralls pytestcov ];

pkgs/development/python-modules/colorlog/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "3.1.4";
+  version = "4.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d";
+    sha256 = "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42";
   };
 
   checkInputs = [ pytest ];

pkgs/development/python-modules/credstash/default.nix

@@ -9,6 +9,14 @@ buildPythonPackage rec {
     sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb";
   };
 
+  # The install phase puts an executable and a copy of the library it imports in
+  # bin/credstash and bin/credstash.py, despite the fact that the library is also
+  # installed to lib/python<version>/site-packages/credstash.py.
+  # If we apply wrapPythonPrograms to bin/credstash.py then the executable will try
+  # to import the credstash module from the resulting shell script. Removing this
+  # file ensures that Python imports the module from site-packages library.
+  postInstall = "rm $out/bin/credstash.py";
+
   nativeBuildInputs = [ nose ];
 
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];

pkgs/development/python-modules/cysignals/default.nix

@@ -9,11 +9,11 @@ assert pariSupport -> pari != null;
 
 buildPythonPackage rec {
   pname = "cysignals";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rzwd9bjw6bj01xcmimqfim1g0njjyyyal0f93frm1la4hcmq96v";
+    sha256 = "1yh4lyrinhxxra42p0k4hiyjdrqjmifg4gnmf4bky5wa0mqnyai6";
   };
 
   # explicit check:

pkgs/development/python-modules/cytoolz/default.nix

@@ -5,6 +5,7 @@
 , nose
 , toolz
 , python
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,15 @@ buildPythonPackage rec {
     sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5";
   };
 
+  patches = [
+    # temporal fix for a test failure: https://github.com/pytoolz/cytoolz/issues/122
+    (fetchpatch {
+      name = "py37.patch";
+      url = https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch;
+      sha256 = "1z29y7s5n751q3f74r3bz0f48yg6izvi68hc4pkwcalxmkq5r1n9";
+    })
+  ];
+
   # Extension types
   disabled = isPyPy;
 
@@ -28,9 +38,9 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "https://github.com/pytoolz/cytoolz/";
+    homepage = https://github.com/pytoolz/cytoolz/;
     description = "Cython implementation of Toolz: High performance functional utilities";
     license = "licenses.bsd3";
     maintainers = with lib.maintainers; [ fridh ];
   };
-}
+}

pkgs/development/python-modules/daphne/default.nix

@@ -4,7 +4,7 @@
 }:
 buildPythonPackage rec {
   pname = "daphne";
-  version = "2.2.2";
+  version = "2.2.3";
 
   disabled = !isPy3k;
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "1pr3b7zxjp2jx31lpiy1hfyprpmyiv2kd18n8x6kh6gd5nr0dgp8";
+    sha256 = "0v3krlqdv39y021dcyf6fl9zys0z1dpw5mqfmkryna5ngxwzlkwd";
   };
 
   nativeBuildInputs = [ pytestrunner ];

pkgs/development/python-modules/dkimpy/default.nix

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dkimpy";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cfj2jsfqbwkrg9y5inz61wxf8z4rrs5js6dizjgsd4lyb3b5inj";
+    sha256 = "0rq3543m0q7kfl02l8ji4c35qbxb99h2mzjaxbaxfrlk6dcpk76j";
 };
 
   checkInputs = [ pytest ];

pkgs/development/python-modules/fb-re2/default.nix

@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, re2
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "fb-re2";
+  version = "1.0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c";
+  };
+
+  buildInputs = [ re2 ];
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Python wrapper for Google's RE2";
+    homepage = https://github.com/facebook/pyre2;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}

pkgs/development/python-modules/ftfy/default.nix

@@ -1,5 +1,6 @@
 { stdenv
 , buildPythonPackage
+, isPy3k
 , fetchPypi
 , html5lib
 , wcwidth
@@ -15,6 +16,7 @@ buildPythonPackage rec {
   # python 2 and 3, they have pinned ftfy to the v4 branch.
   # I propose to stick to v4 until another package requires v5.
   # At that point we can make a ftfy_v4 package.
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;

pkgs/development/python-modules/git-annex-adapter/default.nix

@@ -39,6 +39,12 @@ buildPythonPackage rec {
       url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
       sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir";
     })
+
+    # fix test broken due to renaming of repository version 6 to 7
+    (fetchpatch {
+      url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch;
+      sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7";
+    })
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin:
     # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b

pkgs/development/python-modules/graph-tool/2.x.x.nix

@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
-pkgconfig, boost, expat, scipy, cgal, gmp, mpfr,
-gobject-introspection, pygobject3, gtk3, matplotlib, ncurses,
-buildPythonPackage }:
+{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
+, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr
+, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
+, buildPythonPackage
+, fetchpatch
+}:
 
 buildPythonPackage rec {
   pname = "graph-tool";
@@ -20,6 +22,15 @@ buildPythonPackage rec {
     sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
   };
 
+  patches = [
+    # fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509)
+    (fetchpatch {
+      name = "cgal-4.13.patch";
+      url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch";
+      sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m";
+    })
+  ];
+
   configureFlags = [
     "--with-python-module-path=$(out)/${python.sitePackages}"
     "--with-boost-libdir=${boost}/lib"

pkgs/development/python-modules/gym/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage, fetchPypi
+, numpy, requests, six, pyglet, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "gym";
+  version = "0.9.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0llbhn3zdlsz2crd5grd1yygg8zp2shsclc24iqix5gw5f65clx5";
+  };
+
+  propagatedBuildInputs = [
+    numpy requests six pyglet scipy
+  ];
+
+  # The test needs MuJoCo that is not free library.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
+    homepage = https://gym.openai.com/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ hyphon81 ];
+  };
+}

pkgs/development/python-modules/jeepney/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+, testpath
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "jeepney";
+  version = "0.4";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0w1w1rawl9k4lx91w16d19kbmf1349mhy8ph8x3w0qp1blm432b0";
+  };
+
+  propagatedBuildInputs = [
+    tornado
+  ];
+
+  checkInputs = [
+    pytest
+    testpath
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    homepage = https://gitlab.com/takluyver/jeepney;
+    description = "Pure Python DBus interface";
+    license = licenses.mit;
+  };
+}

pkgs/development/python-modules/lmdb/default.nix

@@ -1,7 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
+, pytest
+, cffi
 }:
 
 buildPythonPackage rec {
@@ -13,8 +14,11 @@ buildPythonPackage rec {
     sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww";
   };
 
-  # Some sort of mysterious failure with lmdb.tool
-  doCheck = !isPy3k;
+  checkInputs = [ pytest cffi ];
+  checkPhase = ''
+    export PYTHONPATH=.:$PYTHONPATH
+    py.test
+  '';
 
   meta = with stdenv.lib; {
     description = "Universal Python binding for the LMDB 'Lightning' Database";

pkgs/development/python-modules/ludios_wpull/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, chardet
+, dnspython
+, html5-parser
+, lxml
+, namedlist
+, sqlalchemy
+, tornado_4
+, Yapsy
+}:
+
+buildPythonPackage rec {
+  pname = "ludios_wpull";
+  version = "3.0.7";
+
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    rev = "${version}";
+    owner = "ludios";
+    repo = "wpull";
+    sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
+  };
+
+  propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ];
+
+  # Test suite has tests that fail on all platforms
+  doCheck = false;
+
+  meta = {
+    description = "Web crawler; fork of wpull used by grab-site";
+    homepage = https://github.com/ludios/wpull;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}

pkgs/development/python-modules/manhole/default.nix

@@ -0,0 +1,44 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, requests
+, process-tests
+}:
+
+buildPythonPackage rec {
+  pname = "manhole";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m";
+  };
+
+  # test_help expects architecture-dependent Linux signal numbers.
+  #
+  # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket
+  # on the x86_64-darwin builder.
+  doCheck = stdenv.isLinux;
+
+  checkInputs = [ pytest requests process-tests ];
+  checkPhase = ''
+    # Based on its tox.ini
+    export PYTHONUNBUFFERED=yes
+    export PYTHONPATH=.:tests:$PYTHONPATH
+
+    # The tests use manhole-cli
+    export PATH="$PATH:$out/bin"
+
+    # test_uwsgi fails with:
+    # http.client.RemoteDisconnected: Remote end closed connection without response
+    py.test -vv -k "not test_uwsgi"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ionelmc/python-manhole;
+    description = "Debugging manhole for Python applications";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ ivan ];
+  };
+}

pkgs/development/python-modules/misaka/default.nix

@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, cffi }:
 buildPythonPackage rec {
   pname = "misaka";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7";
+    sha256 = "1mzc29wwyhyardclj1vg2xsfdibg2lzb7f1azjcxi580ama55wv2";
   };
 
   propagatedBuildInputs = [ cffi ];

pkgs/development/python-modules/mockito/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
+
+buildPythonPackage rec {
+  version = "1.1.1";
+  pname = "mockito";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "142f5e8865a422ad2d67b9c67a382e3296e8f1633dbccd0e322180fba7d5303d";
+  };
+
+  # Failing tests due 2to3
+  doCheck = !isPy3k;
+
+  propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ];
+  checkInputs = [ pytest numpy ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Spying framework";
+    homepage = https://github.com/kaste/mockito-python;
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}

pkgs/development/python-modules/mwclient/default.nix

@@ -2,7 +2,7 @@
 , responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }:
 
 buildPythonPackage rec {
-  version = "0.9.2";
+  version = "0.9.3";
   pname = "mwclient";
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "mwclient";
     repo = "mwclient";
     rev = "v${version}";
-    sha256 = "0553pa5gm74k0lsrbcw5ic8jypnh5c3p58i50kzjvgcqz4frsafi";
+    sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw";
   };
 
   buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];

pkgs/development/python-modules/mypy/default.nix

@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.641";
+  version = "0.650";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ma4l7px96zzb8x89dk9mkrrdzdhdqckvfsbld4fj9n25k1iw1wf";
+    sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q";
   };
 
   disabled = !isPy3k;

pkgs/development/python-modules/namedlist/default.nix

@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "namedlist";
+  version = "1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11n9c4a5ak9971awkf1g92m6mcmiprhrw98ik2cmjsqxmz73j2qr";
+  };
+
+  # Test file has a `unittest.main()` at the bottom that fails the tests;
+  # py.test can run the tests without it.
+  postPatch = ''
+    substituteInPlace test/test_namedlist.py --replace "unittest.main()" ""
+  '';
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Similar to namedtuple, but instances are mutable";
+    homepage = https://bitbucket.org/ericvsmith/namedlist;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}

pkgs/development/python-modules/neovim_gui/default.nix

@@ -1,35 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, neovim
-, click
-, pygobject3
-, isPy27
-, pkgs
-}:
-
-buildPythonPackage rec {
-  pname = "neovim-pygui";
-  version = "0.1.3";
-  disabled = !isPy27;
-
-  src = fetchFromGitHub {
-    owner = "neovim";
-    repo = "python-gui";
-    rev = version;
-    sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz";
-  };
-
-  propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobject-introspection pkgs.makeWrapper pkgs.gtk3 ];
-
-  patchPhase = ''
-    sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/pynvim \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH"
-  '';
-
-}

pkgs/development/python-modules/ordered-set/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "ordered-set";
-  version = "3.0.2";
+  version = "3.1";
 
   buildInputs = [ pytest pytestrunner ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d292b866fa44f339ac6e624e3d338accfb415ce0a8431595d51990fbdf61d3b";
+    sha256 = "0slg1ys58dzxl96mws3sydzavdzqdk0s2nrc852dphd9kbm07dzr";
   };
 
   checkPhase = ''

pkgs/development/python-modules/parver/default.nix

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "parver";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05dsjmk3ckd175ln8smxr1f6l6qsrjyd8s5vfqc5x7fii3vgyjmc";
+    sha256 = "1nylv880zxnm9waw32y8dmdc435jv5gjcajv8qahafm7v1prgcmq";
   };
 
   propagatedBuildInputs = [ six attrs arpeggio ];

pkgs/development/python-modules/pelican/default.nix

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "3.7.1";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = "pelican";
     rev = version;
-    sha256 = "0nkxrb77k2bra7bqckg7f5k73wk98hcbz7rimxl8sw05b2bvd62g";
+    sha256 = "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl";
   };
 
   doCheck = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     glibcLocales
     # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
     # again. Compare https://github.com/getpelican/pelican/pull/2252.
-    # Version 3.7.1 is incompatible with our current pandoc version.
+    # Version 4.0.1 is incompatible with our current pandoc version.
     # pandoc
     git
     mock

pkgs/development/python-modules/phonenumbers/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.10.0";
+  version = "8.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06nj00qlw2qx5wvwvg32izxq461lyrkif23giixaw2xmzzddzy0l";
+    sha256 = "08cpjmvbm9aazdhlr6pm7msmazysfrdzf4pilnlq8w0ddw1szh7i";
   };
 
   meta = {

pkgs/development/python-modules/protobuf/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, python, buildPythonPackage
+{ stdenv, fetchpatch, python, buildPythonPackage, isPy37
 , protobuf, google_apputils, pyext, libcxx
 , disabled, doCheck ? true }:
 
@@ -16,14 +16,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ protobuf google_apputils ];
   buildInputs = [ google_apputils pyext ];
 
-  patches = [
+  patches = optional isPy37
     # Python 3.7 compatibility (remove when protobuf 3.7 is released)
     (fetchpatch {
       url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
       sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
       stripLen = 1;
     })
-  ];
+  ;
 
   prePatch = ''
     while [ ! -d python ]; do

pkgs/development/python-modules/prov/default.nix

@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "prov";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb";
+    sha256 = "1a9h406laclxalmdny37m0yyw7y17n359akclbahimdggq853jd0";
   };
 
   prePatch = ''

pkgs/development/python-modules/ptest/default.nix

@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "ptest";
-  version =  "1.5.3";
+  version =  "1.7.4";
 
   src = fetchFromGitHub {
     owner = "KarlGong";
     repo = pname;
     rev = version + "-release";
-    sha256 = "1r50lm6n59jzdwpp53n0c0hp3aj1jxn304bk5gh830226gsaf2hn";
+    sha256 = "0v1zpfjagjlvdmgv6d502nmb7s996wadvpzg93i651s64rrlwq4s";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/pybtex/default.nix

@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
 
 buildPythonPackage rec {
-  version = "0.21";
+  version = "0.22.0";
   pname = "pybtex";
 
   doCheck = false;
@@ -9,7 +9,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg";
+    sha256 = "0rprg7h12pv9rb6bi950mz1disc265sg5qcg34637ns1z74hxdr6";
   };
 
   meta = {

pkgs/development/python-modules/pycountry/default.nix

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pycountry";
-  version = "18.5.26";
+  version = "18.12.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz";
+    sha256 = "1phn1av57jbm166facjk6r8gw4pf886q4wymjc443k8m5c5h5i4f";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/pydot/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pydot";
-  version = "1.2.4";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "92d2e2d15531d00710f2d6fb5540d2acabc5399d464f2f20d5d21073af241eb6";
+    sha256 = "02yp2k7p1kh0azwd932jhvfc3nxxdv9dimh7hdgwdnmp05yms6cq";
   };
   checkInputs = [ chardet ];
   # No tests in archive

pkgs/development/python-modules/pyfiglet/default.nix

@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.7.6";
+  version = "0.8.post0";
   pname = "pyfiglet";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08npllxf85ccvhd27iyq2j1b813s1947q5b1x7vxv9hdni8rdmcp";
+    sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519";
   };
 
   doCheck = false;

pkgs/development/python-modules/pynvim/default.nix

@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "neovim";
+  pname = "pynvim";
   version = "0.3.1";
 
   src = fetchPypi {

pkgs/development/python-modules/pyshp/default.nix

@@ -2,12 +2,12 @@
 , setuptools }:
 
 buildPythonPackage rec {
-  version = "1.2.12";
+  version = "2.0.0";
   pname = "pyshp";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179";
+    sha256 = "0l5a28878vplwclqvjj7v0xx6zlr03ia1dkq5hc3mxf05bahiwyz";
   };
 
   buildInputs = [ setuptools ];

pkgs/development/python-modules/pyside/shiboken.nix

@@ -1,4 +1,4 @@
-{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }:
+{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }:
 
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   '';
 
   # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
-  patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch);
+  patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
 
   cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
 

pkgs/development/python-modules/pyside/shiboken_py35.patch

@@ -6,7 +6,7 @@ diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs
  # CMAKE_FIND_FRAMEWORKS(Python)
  
 -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
-+FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
    IF(_CURRENT_VERSION GREATER 3.1)
        SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
    ELSE()

pkgs/development/python-modules/pytest-dependency/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  version = "0.4.0";
+  pname = "pytest-dependency";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142";
+  };
+
+  propagatedBuildInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/RKrahl/pytest-dependency;
+    description = "Manage dependencies of tests";
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}

pkgs/development/python-modules/rasterio/default.nix

@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.0.10";
+  version = "1.0.12";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "rasterio";
     rev = version;
-    sha256 = "0gnck9y3n31nnazlrw54swab8wql9qjx5r5x9r7hrmzy72xlzjqq";
+    sha256 = "0mdm03yhlcsa9jwy1yzvqrzk4spmh1dzjaq9krsj958k7wkps672";
   };
 
   checkInputs = [ boto3 pytest pytestcov packaging hypothesis ];

pkgs/development/python-modules/rednose/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, nose, six, colorama, termstyle }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, nose, six, colorama, termstyle }:
 
 buildPythonPackage rec {
   pname = "rednose";
@@ -13,10 +13,14 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
   '';
 
+  # Do not test on Python 2 darwin because the tests suite gets stuck
+  # https://github.com/JBKahn/rednose/issues/23
+  doCheck = !(stdenv.isDarwin && isPy27);
+
   checkInputs = [ six ];
   propagatedBuildInputs = [ nose colorama termstyle ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A python nose plugin adding color to console results";
     homepage = https://github.com/JBKahn/rednose;
     license = licenses.mit;

pkgs/development/python-modules/rfc3986/default.nix

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "rfc3986";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b";
+    sha256 = "1qf4dyxvjs7mxrxc0gr7gzyn4iflb2wgq01r5pzrxac8rnvy8fmw";
   };
 
   buildInputs = [ pytest ];

pkgs/development/python-modules/robotframework-selenium2library/default.nix

@@ -1,11 +1,4 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, robotframework
-, selenium
-, docutils
-, decorator
-}:
+{ stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }:
 
 buildPythonPackage rec {
   version = "3.0.0";
@@ -16,15 +9,16 @@ buildPythonPackage rec {
     sha256 = "2a8e942b0788b16ded253039008b34d2b46199283461b294f0f41a579c70fda7";
   };
 
-  # error: invalid command 'test'
-  #doCheck = false;
+  # Neither the PyPI tarball nor the repository has tests
+  doCheck = false;
 
-  propagatedBuildInputs = [ robotframework selenium docutils decorator ];
+  propagatedBuildInputs = [ robotframework-seleniumlibrary ];
 
   meta = with stdenv.lib; {
     description = "Web testing library for Robot Framework";
-    homepage = http://robotframework.org/;
+    homepage = https://github.com/robotframework/Selenium2Library;
     license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
   };
 
 }

pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
+
+buildPythonPackage rec {
+  version = "3.2.0";
+  pname = "robotframework-seleniumlibrary";
+
+  # no tests included in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "robotframework";
+    repo = "SeleniumLibrary";
+    rev = "v${version}";
+    sha256 = "106dl0qgf52wqk1xn4ghj7n2fjhaq0fh2wlnqn29aczbv5q581y3";
+  };
+
+  propagatedBuildInputs = [ robotframework selenium ];
+  checkInputs = [ mockito robotstatuschecker approvaltests ];
+
+  # Only execute Unit Tests. Acceptance Tests require headlesschrome, currently
+  # not available in nixpkgs
+  checkPhase = ''
+    ${python.interpreter} utest/run.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Web testing library for Robot Framework";
+    homepage = https://github.com/robotframework/SeleniumLibrary;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}

pkgs/development/python-modules/robotstatuschecker/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }:
+
+buildPythonPackage rec {
+  version = "1.3";
+  pname = "robotstatuschecker";
+
+  # no tests included in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "robotframework";
+    repo = "statuschecker";
+    rev = version;
+    sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln";
+  };
+
+  propagatedBuildInputs = [ robotframework ];
+
+  checkPhase = ''
+    ${python.interpreter} test/run.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for checking that Robot Framework test cases have expected statuses and log messages";
+    homepage = https://github.com/robotframework/statuschecker;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}

pkgs/development/python-modules/rpy2/default.nix

@@ -27,7 +27,7 @@ buildPythonPackage rec {
     version = if isPy27 then
       "2.8.6" # python2 support dropped in 2.9.x
     else
-      "2.9.4";
+      "2.9.5";
     pname = "rpy2";
     disabled = isPyPy;
     src = fetchPypi {
@@ -35,7 +35,7 @@ buildPythonPackage rec {
       sha256 = if isPy27 then
         "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x
       else
-        "0bl1d2qhavmlrvalir9hmkjh74w21vzkvc2sg3cbb162s10zfmxy"; # 2.9.x
+        "1nrj8pgyxrwrfdrxzb4j3z1adjwjx1mr8d1n5cmrz4nhlzy8w7xr"; # 2.9.x
     };
     buildInputs = [
       readline

pkgs/development/python-modules/s3fs/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "0.1.6";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "38a3dda6800a5dc6ed697bff8e9a47d84f5c28d186dc25d2ff2f91b445f0dae5";
+    sha256 = "1p14sm3lbkwz2fidiinmyfyxwkh58ymjb0c0bsv5i0zfv0fy87x3";
   };
 
   buildInputs = [ docutils ];

pkgs/development/python-modules/scp/default.nix

@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "scp";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cjyc19v46lwrhdyc18f87z589rhqg7zjg0s8a05w6mv3262b6ai";
+    sha256 = "09219c45hafq6pb8z6rsinsfhp3rsx5mr9cgz2099rcs4if2gk6g";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/secretstorage/default.nix

@@ -1,23 +1,28 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage
-, dbus-python, cryptography }:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }:
 
 buildPythonPackage rec {
   pname = "secretstorage";
-  version = "2.3.1";
+  version = "3.1.0";
 
-  src = fetchFromGitHub {
-    owner = "mitya57";
-    repo = "secretstorage";
-    rev = version;
-    sha256 = "1sjd2jjbxgkkxyrfwx89x0hsnn39w2cr2qkxbg1iz52znr4sqism";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    pname = "SecretStorage";
+    inherit version;
+    sha256 = "12vxzradibfmznssh7x2zd7qym2hl7wn34fn2yn58pnx6sykrai9";
   };
 
-  propagatedBuildInputs = [ dbus-python cryptography ];
+  propagatedBuildInputs = [
+    cryptography
+    jeepney
+    pygobject3
+  ];
 
-  doCheck = false; # requires dbus session
+  # Needs a D-Bus Sesison
+  doCheck = false;
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/mitya57/secretstorage";
+  meta = with lib; {
+    homepage = https://github.com/mitya57/secretstorage;
     description = "Python bindings to FreeDesktop.org Secret Service API";
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ teto ];

pkgs/development/python-modules/slither-analyzer/default.nix

@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, makeWrapper, prettytable, pythonOlder, solc }:
+
+buildPythonPackage rec {
+  pname = "slither-analyzer";
+  version = "0.3.0";
+
+  disabled = pythonOlder "3.6";
+
+  # No Python tests
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10vrcqm371kqmf702xmqmzimv3xgrn3k3ip06nr1l6gnj3jk138g";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  propagatedBuildInputs = [ prettytable ];
+
+  postFixup = ''
+    wrapProgram $out/bin/slither \
+      --prefix PATH : "${lib.makeBinPath [ solc ]}"
+  '';
+
+  meta = with lib; {
+    description = "Static Analyzer for Solidity";
+    longDescription = ''
+      Slither is a Solidity static analysis framework written in Python 3. It
+      runs a suite of vulnerability detectors, prints visual information about
+      contract details, and provides an API to easily write custom analyses.
+    '';
+    homepage = https://github.com/trailofbits/slither;
+    license = licenses.agpl3;
+    maintainers = [ maintainers.asymmetric ];
+  };
+}

pkgs/development/python-modules/spacy/default.nix

@@ -2,14 +2,12 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
-, html5lib
 , pytest
 , preshed
 , ftfy
 , numpy
 , murmurhash
 , plac
-, six
 , ujson
 , dill
 , requests
@@ -23,19 +21,17 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.0.16";
+  version = "2.0.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ghgbv819ff4777904p1kzayq1dj34i7853anvg859sak59r7pj1";
+    sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj";
   };
 
   prePatch = ''
     substituteInPlace setup.py \
       --replace "regex==" "regex>=" \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
-      --replace "thinc>=6.12.0,<6.13.0" "thinc>=6.12.0" \
-      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
   '';
 
   propagatedBuildInputs = [
@@ -45,8 +41,6 @@ buildPythonPackage rec {
    preshed
    thinc
    plac
-   six
-   html5lib
    ujson
    dill
    requests

pkgs/development/python-modules/spambayes/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "spambayes";
-  version = "1.1b2";
+  version = "1.1b3";
 
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1542dwdsmkav38cfjlbgf3bzz3z8nk7wzq173ya8ipk7g8g6s64d";
+    sha256 = "016r3g43ja73rls1nh1dl82d75lgsjdl4cv2r5s7zcihm47nb38q";
   };
 
   propagatedBuildInputs = [ bsddb3 pydns lockfile ];

pkgs/development/python-modules/sphinx-testing/default.nix

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "sphinx-testing";
-  version = "0.7.2";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d30f93007620e137b33edf19f52a7225eab853546b7e588ef09d1342e821e94";
+    sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf";
   };
 
   checkInputs = [ mock ];

pkgs/development/python-modules/splinter/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "splinter";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0il187zajpiw4p011nkb4bcjxxd85f131bcqz31201ff14ifvih8";
+    sha256 = "1x5g7pfj813rnci7dc46y01bq24qzw5qwlzm4iw61hg66q2kg7rd";
   };
 
   propagatedBuildInputs = [ selenium ];

pkgs/development/python-modules/thinc/default.nix

@@ -19,18 +19,17 @@
 , plac
 , six
 , mock
-, termcolor
 , wrapt
 , dill
 }:
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "6.12.0";
+  version = "6.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lfdf08v7rrj9b29z2vf8isaqa0zh16acw9im8chkqsh8bay4ykm";
+    sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -45,20 +44,18 @@ buildPythonPackage rec {
    preshed
    numpy
    murmurhash
-   pytest
-   hypothesis
    tqdm
    cytoolz
    plac
    six
-   mock
-   termcolor
    wrapt
    dill
   ] ++ lib.optional (pythonOlder "3.4") pathlib;
 
 
   checkInputs = [
+    hypothesis
+    mock
     pytest
   ];
 
@@ -66,7 +63,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \
       --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \
-      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
+      --replace "msgpack-numpy<0.4.4" "msgpack-numpy"
   '';
 
   # Cannot find cython modules.

pkgs/development/python-modules/timeout-decorator/default.nix

@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "timeout-decorator";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bckwbi5078z3x9lyf8vl9dhx10nymwwnp46c98wm5m02x5j37g4";
+    sha256 = "1inkf68i2s2x27arpqwkdxigiqbpbpjbbnfv7jzsrif1fmp2fphs";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/tlslite-ng/default.nix

@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ecdsa
+}:
+
+buildPythonPackage rec {
+  pname = "tlslite-ng";
+  version = "0.7.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1aw7j50byzab0xwp50m5w5c14fzdzwk2law5a5bn6dn3i5fc6fw2";
+  };
+
+  buildInputs = [ ecdsa ];
+
+  meta = with stdenv.lib; {
+    description = "Pure python implementation of SSL and TLS.";
+    homepage = https://pypi.python.org/pypi/tlslite-ng;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.erictapen ];
+  };
+
+}

pkgs/development/python-modules/tlslite/default.nix

@@ -1,21 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "tlslite";
-  version = "0.4.9";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d";
-  };
-
-  meta = with stdenv.lib; {
-    description = "A pure Python implementation of SSL and TLS";
-    homepage = https://pypi.python.org/pypi/tlslite;
-    license = licenses.bsd3;
-  };
-
-}

pkgs/development/python-modules/tweepy/default.nix

@@ -2,18 +2,11 @@
 
 buildPythonPackage rec {
   pname = "tweepy";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c";
-  };
-
-  # Fix build with pip 10
-  # https://github.com/tweepy/tweepy/pull/1030
-  patches = fetchpatch {
-    url = "${meta.homepage}/commit/778bd7a31d2f5fae98652735e7844533589ca221.patch";
-    sha256 = "1sqmjn0ngiynhfkdkcs33qmvl49ysfp8522hvxjk8bx252y9qw2h";
+    sha256 = "fe85a79f58a01dd335968523b91c5fce760e7fe78bf25a6e71c72204fe499d0b";
   };
 
   doCheck = false;

pkgs/development/python-modules/twilio/default.nix

@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "6.19.2";
+  version = "6.21.0";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "1dymn98wlby93jx7agvmhzy5dvwmaclz481lbzgvbqavy3n0sbdk";
+    sha256 = "1xinj2vyfasi1j3g7kk7xkmp6w8yawaqi3dz7mvibf9ywsi4dhc9";
   };
 
   buildInputs = [ nose mock ];

pkgs/development/python-modules/urwidtrees/default.nix

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "urwidtrees";
-  version  = "1.0";
+  version  = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "urwidtrees";
     rev = "${version}";
-    sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa";
+    sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2";
   };
 
   propagatedBuildInputs = [ urwid ];

pkgs/development/python-modules/yapf/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf";
+    sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/yapsy/default.nix

@@ -12,8 +12,6 @@ buildPythonPackage rec {
     sha256 = "f08cb229a96f14cc0b1d4b68cb7c111d1020ab8c3989b426d3aa39b82d6a3e3c";
   };
 
-  doCheck = false;
-
   meta = with stdenv.lib; {
     homepage = http://yapsy.sourceforge.net/;
     description = "Yet another plugin system";

pkgs/development/python-modules/yarl/default.nix

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.2.6";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c8cbc21bbfa1dd7d5386d48cc814fe3d35b80f60299cdde9279046f399c3b0d8";
+    sha256 = "024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9";
   };
 
   checkInputs = [ pytest pytestrunner ];