Merge branch 'master' into python-trezor-fix-master

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

@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.3.1";
+  version = "3.4.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b";
+    sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316";
   };
 
   buildInputs = [

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

@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Cython";
   name = "${pname}-${version}";
-  version = "0.26.1";
+  version = "0.27.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5";
+    sha256 = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64";
   };
 
   # With Python 2.x on i686-linux or 32-bit ARM this test fails because the

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

@@ -1,19 +1,31 @@
 { fetchPypi, buildPythonPackage, lib
-, requests, beautifulsoup4, six }:
+, requests, beautifulsoup4, six
+, pytestrunner, requests-mock, pytestcov, pytest
+}:
 
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "MechanicalSoup";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d";
+    sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da";
   };
 
+  checkInputs = [ pytest pytestrunner requests-mock pytestcov ];
+
   propagatedBuildInputs = [ requests beautifulsoup4 six ];
 
+  # Requires network
+  doCheck = false;
+
+  postPatch = ''
+    # Is in setup_requires but not used in setup.py...
+    substituteInPlace setup.py --replace "'pytest-runner'," ""
+  '';
+
   meta = with lib; {
     description = "A Python library for automating interaction with websites";
     homepage = https://github.com/hickford/MechanicalSoup;

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

@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.9";
+  version = "7.8.10";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4";
+    sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537";
   };
 
   meta = {

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

@@ -0,0 +1,16 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "affinity";
+  version = "0.1.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
+  };
+  meta = {
+    description = "control processor affinity on windows and linux";
+    homepage    = http://cheeseshop.python.org/pypi/affinity;
+    license     = with lib.licenses; [ psfl ];
+  };
+}

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

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "aiofiles";
-  version = "0.3.1";
+  version = "0.3.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a";
+    sha256 = "852a493a877b73e11823bfd4e8e5ef2610d70d12c9eaed961bcd9124d8de8c10";
   };
 
   disabled = pythonOlder "3.3";

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

@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "2.2.5";
+  version = "2.3.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc";
+    sha256 = "42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736";
   };
 
   disabled = pythonOlder "3.4";

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05";
+    sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "1.2.0";
+  version = "1.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n";
+    sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7";
   };
 
   buildInputs = [ pytest ];

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

@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "1.2.1";
+  version = "1.3.0";
   name = "${pname}-${version}";
 
   meta = with stdenv.lib; {
@@ -16,6 +16,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c";
+    sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1";
   };
 }

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

@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "asana";
-  version = "0.6.2";
+  version = "0.6.5";
   name = "${pname}-${version}";
 
   meta = {
@@ -15,10 +15,10 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0skai72392n3i1c4bl3hn2kh5lj990qsbasdwkbjdcy6vq57jggf";
+    sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ requests requests_oauthlib six ];
 
   patchPhase = ''

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

@@ -2,13 +2,13 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "asgi_ipc";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-    sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43";
+    sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037";
   };
 
   propagatedBuildInputs = [ asgiref msgpack posix_ipc ];

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

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "asn1crypto";
-  version = "0.22.0";
+  version = "0.23.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a";
+    sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70";
   };
 
   # No tests included

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

@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   
   pname = "astropy";
-  version = "2.0.1";
+  version = "2.0.2";
 
   name = "${pname}-${version}";
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
+    sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

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

@@ -7,13 +7,13 @@
 
 let
   pname = "async-timeout";
-  version = "1.3.0";
+  version = "2.0.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f";
+    sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566";
   };
 
   buildInputs = [ pytestrunner ];

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "autobahn";
-  version = "17.8.1";
+  version = "17.9.3";
 
   src = fetchurl {
     url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4";
+    sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which

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

@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, pycodestyle }:
+
+buildPythonPackage rec {
+  pname = "autopep8";
+  version = "1.3.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z";
+  };
+
+  propagatedBuildInputs = [ pycodestyle ];
+
+  # One test fails:
+  # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
+    homepage = https://pypi.python.org/pypi/autopep8/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

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

@@ -0,0 +1,35 @@
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, backports_weakref
+}:
+
+buildPythonPackage rec {
+  pname = "backports.tempfile";
+  version = "1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762";
+  };
+
+  buildInputs = [ setuptools_scm ];
+
+  propagatedBuildInputs = [ backports_weakref ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s tests
+  '';
+
+  # requires https://pypi.org/project/backports.test.support
+  doCheck = false;
+
+  meta = {
+    description = "Backport of new features in Python's tempfile module";
+    license = lib.licenses.psfl;
+    homepage = https://github.com/pjdelport/backports.tempfile;
+  };
+}

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

@@ -9,10 +9,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "backports.weakref";
-  version = "1.0rc1";
+  version = "1.0.post1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8";
+    sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2";
   };
 
   buildInputs = [ setuptools_scm ];

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

@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "bayespy";
-  version = "0.5.10";
+  version = "0.5.12";
   name = "${pname}-${version}";
 
   # Python 2 not supported and not some old Python 3 because MPL doesn't support
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01cwd88ri29zy6qpvnqzljkgc44n7a17yijizr73blcnh4dz5n1w";
+    sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00";
   };
 
   checkInputs = [ pytest glibcLocales ];

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

@@ -4,13 +4,13 @@
 with stdenv.lib;
 
 buildPythonPackage rec {
-  version = "3.1.3";
+  version = "3.1.4";
   pname = "bcrypt";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
-    sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488";
+    sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d";
   };
   buildInputs = [ pycparser mock pytest py ];
   propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;

pkgs/development/python-modules/betamax-matchers/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, betamax, requests_toolbelt }:
+
+buildPythonPackage rec {
+  pname = "betamax-matchers";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43";
+  };
+
+  buildInputs = [ betamax requests_toolbelt ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sigmavirus24/betamax_matchers;
+    description = "A group of experimental matchers for Betamax";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pSub ];
+  };
+}

pkgs/development/python-modules/betamax-serializers/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, betamax, pyyaml }:
+
+buildPythonPackage rec {
+  pname = "betamax-serializers";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yqzwx204m4lxlpg04cwv6iwzmcpdzr19wvj97vvxchp0g4qg83d";
+  };
+
+  buildInputs = [ betamax pyyaml ];
+
+  meta = with stdenv.lib; {
+    homepage = https://gitlab.com/betamax/serializers;
+    description = "A set of third-party serializers for Betamax";
+    license = licenses.asl20;
+  };
+}

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

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "bitstring";
+  version = "3.1.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
+    extension = "zip";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Module for binary data manipulation";
+    homepage = "https://github.com/scott-griffiths/bitstring";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

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

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+, pillow, webcolors, funcparserlib
+}:
+
+buildPythonPackage rec {
+  name = "blockdiag-${version}";
+  version = "1.5.3";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
+    sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
+  };
+
+  buildInputs = [ pep8 nose unittest2 docutils ];
+
+  propagatedBuildInputs = [ pillow webcolors funcparserlib ];
+
+  # One test fails:
+  #   ...
+  #   FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
+    homepage = http://blockdiag.com/;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

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

@@ -34,11 +34,11 @@
 buildPythonPackage rec {
   pname = "bokeh";
   name = "${pname}${version}";
-  version = "0.12.9";
+  version = "0.12.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg";
+    sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393";
   };
 
   disabled = isPyPy;

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

@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }:
+
+buildPythonPackage rec {
+  pname = "bpython";
+  version = "0.17";
+  name  = "${pname}-${version}";
+
+  # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706
+  src = fetchurl {
+    url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz";
+    sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz";
+  };
+
+  propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];
+
+  checkInputs = [ mock ];
+
+  # tests fail: https://github.com/bpython/bpython/issues/712
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A fancy curses interface to the Python interactive interpreter";
+    homepage = "https://bpython-interpreter.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli ];
+  };
+}

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

@@ -1,13 +1,13 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.7.2";
+  version = "4.7.3";
   pname = "breathe";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";
-    sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32";
+    sha256 = "d0b0e029daba6c3889d15d6c2dd4b0e9d468dc631d41021d0576c1b0dabee302";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.9.4";
+  version = "2.9.5";
   name = "${pname}-nix-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053";
+    sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa";
   };
 
   patches = [ ./nix.patch ];

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

@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "cement";
   name = "${pname}-${version}";
-  version = "2.8.2";
+  version = "2.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7";
+    sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55";
   };
 
   # Disable test tests since they depend on a memcached server running on

pkgs/development/python-modules/cffi/clang.patch

@@ -0,0 +1,13 @@
+diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
+index a3277b0..0d6e2c3 100644
+--- a/testing/cffi1/test_recompiler.py
++++ b/testing/cffi1/test_recompiler.py
+@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False):
+         char32_t foo_4bytes(char32_t);
+     """)
+     lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """
+-    #if !defined(__cplusplus) || __cplusplus < 201103L
++    #if !defined(__cplusplus)
+     typedef uint_least16_t char16_t;
+     typedef uint_least32_t char32_t;
+     #endif

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

@@ -1,22 +1,24 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
-  version = "1.10.0";
+  version = "1.11.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k";
+    sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
   };
 
+  patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch;
+
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ libffi pycparser ];
   buildInputs = [ pytest ];
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
 
   checkPhase = ''
     py.test

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "cheroot";
-  version = "5.5.0";
+  version = "5.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr";
+    sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3";
   };
 
   propagatedBuildInputs = [ six ];

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

@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }:
+
+buildPythonPackage rec {
+  name = "construct-${version}";
+  version = "2.8.16";
+
+  src = fetchFromGitHub {
+    owner = "construct";
+    repo = "construct";
+    rev = "v${version}";
+    sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  # Tests fail with the following error on Python 3.5+
+  # TypeError: not all arguments converted during string formatting
+  doCheck = pythonOlder "3.5";
+
+  meta = with stdenv.lib; {
+    description = "Powerful declarative parser (and builder) for binary data";
+    homepage = http://construct.readthedocs.org/;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname    = "credstash";
-  version = "1.13.3";
+  version = "1.13.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x2dh4rs5sahb8h2xznhq7srcm2zl9ykc72a8iqpq4dz7l9k7x7i";
+    sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81";
   };
 
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];

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

@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }:
+
+buildPythonPackage rec {
+  pname = "curtsies";
+  version = "0.2.11";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc";
+  };
+
+  propagatedBuildInputs = [ blessings wcwidth pyte ];
+
+  checkInputs = [ nose mock pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Curses-like terminal wrapper, with colored strings!";
+    homepage = https://pypi.python.org/pypi/curtsies;
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli ];
+  };
+}

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

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPyPy
+, nose
+, toolz
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "cytoolz";
+  version = "0.8.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552";
+  };
+
+  # Extension types
+  disabled = isPyPy;
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ toolz ];
+
+  # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
+  checkPhase = ''
+    NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
+  '';
+
+  meta = {
+    homepage = "http://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/dask/default.nix

@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.15.2";
+  version = "0.15.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed";
+    sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea";
   };
 
   checkInputs = [ pytest ];

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

@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, mock
+, numpy
+, multipledispatch
+, dateutil
+}:
+
+buildPythonPackage rec {
+  pname = "datashape";
+  version = "0.5.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783";
+  };
+
+  checkInputs = [ pytest mock ];
+  propagatedBuildInputs = [ numpy multipledispatch dateutil ];
+
+  checkPhase = ''
+    py.test datashape/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/datashape;
+    description = "A data description language";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

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

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+
+buildPythonPackage rec {
+  pname = "demjson";
+  version = "2.2.4";
+  name = "${pname}-${version}";
+  disabled = isPy36;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
+    homepage = http://deron.meranda.us/python/demjson/;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/python-modules/devpi-common/default.nix

@@ -2,18 +2,20 @@
 
 with pythonPackages;buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.2.0rc1";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9";
+    sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd";
   };
 
   propagatedBuildInputs = [ requests py ];
   checkInputs = [ pytest ];
 
   checkPhase = ''
+    # Don't know why this test is failing!
+    substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env"
     py.test
   '';
 

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "discogs-client";
-  version = "2.2.0";
+  version = "2.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kjm4zyxlkv8cjyd4zl0yslbkmfz4ga9nm3d2glpw3nmvmvajn40";
+    sha256 = "9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414";
   };
 
   propagatedBuildInputs = [ requests oauthlib ];

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

@@ -11,13 +11,13 @@
 
 let
   pname = "discord.py";
-  version = "0.16.11";
+  version = "0.16.12";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d";
+    sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];

pkgs/development/python-modules/django-picklefield/default.nix

@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   pname = "django-picklefield";
   name = "${pname}-${version}";
-  version = "0.3.2";
+  version = "1.0.0";
 
   meta = {
     description = "A pickled object field for Django";
@@ -13,6 +13,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qlsbp3798ii68ny9zlz2ppkna00jf7i4hmjal3p8433gi18md7s";
+    sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354";
   };
 }

pkgs/development/python-modules/django/1_11.nix

@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "1.11.6";
+  version = "1.11.7";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "0q0cmwifa6c0k6kh8fpa3mjmqw7yqd616qz8m4ls3h51xyhjrd63";
+    sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649";
   };
 
   patches = stdenv.lib.optionals withGdal [

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

@@ -2,12 +2,12 @@
   mock, django, redis, msgpack }:
 buildPythonPackage rec {
   pname = "django-redis";
-  version = "4.5.0";
+  version = "4.8.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp";
+    sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19";
   };
 
   doCheck = false;

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "django-tagging";
-  version = "0.4.5";
+  version = "0.4.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q";
+    sha256 = "210b32af8372b8f68f261fdb7394075669222608d1e6a3bbf2031d59c826eb68";
   };
 
   # error: invalid command 'test'

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

@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  version = "3.6.4";
+  version = "3.7.1";
   pname = "djangorestframework";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-    sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42";
+    sha256 = "305b2c6564ca46d3b558ba21110ed717135c467adf1a6dfd192bd85f4bb04d50";
   };
 
   # Test settings are missing

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

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchurl, pythonOlder
+{ stdenv, buildPythonApplication, fetchPypi, pythonOlder
 , mock, pytest, nose
 , pyyaml, backports_ssl_match_hostname, colorama, docopt
 , dockerpty, docker, ipaddress, jsonschema, requests
@@ -10,8 +10,8 @@ buildPythonApplication rec {
   pname = "docker-compose";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg";
   };
 

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

@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "dpkt";
+  version = "1.9.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
+    homepage = https://code.google.com/p/dpkt/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.all;
+  };
+}

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

@@ -3,13 +3,13 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.18.2";
+  version = "0.18.5";
   pname = "dulwich";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-    sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b";
+    sha256 = "838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0";
   };
 
   LC_ALL = "en_US.UTF-8";

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "dyn";
-  version = "1.6.3";
+  version = "1.8.0";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xq90fliix5nbv934s3wf2pahmx6m2b9y0kqwn192c76qh7xlzib";
+    sha256 = "4ab3cd9a1478674cf2d2aa6740fb0ddf77daaa9ab3e35e5d2bc92f60301f8523";
   };
 
   buildInputs = [ glibcLocales ];

pkgs/development/python-modules/easy-thumbnails/default.nix

@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "easy-thumbnails";
   name = "${pname}-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   meta = {
     description = "Easy thumbnails for Django";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0w228b6hx8k4r15v7z62hyg99qp6xp4mdkgqs1ah64fyqxp1riaw";
+    sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4";
   };
 
   propagatedBuildInputs = [ django pillow ];

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

@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "edward";
-  version = "1.3.3";
+  version = "1.3.4";
   name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891";
+    sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:

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

@@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.7.18";
+  version = "0.8.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429";
+    sha256 = "3c98dd04bba667ecfddb77fcd0dfd19b376b258d21beeaf5b95578826e275a83";
   };
 
   checkInputs = [

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

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, python, fetchurl }:
+
+buildPythonPackage rec {
+  name = "fastimport-${version}";
+  version = "0.9.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/f/fastimport/${name}.tar.gz";
+    sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/python-fastimport;
+    description = "VCS fastimport/fastexport parser";
+    maintainers = with maintainers; [ koral ];
+    license = licenses.gpl2Plus;
+  };
+}

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

@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "faulthandler";
+  version = "2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r";
+  };
+
+  meta = {
+    description = "Dump the Python traceback";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers; [ sauyon ];
+    homepage = http://faulthandler.readthedocs.io/;
+  };
+}

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

@@ -2,17 +2,18 @@
 
 buildPythonPackage rec {
   pname = "feedgen";
-  version = "0.5.1";
+  version = "0.6.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787";
+    sha256 = "e5a1f2a8aaed06dae325e6024aa7083e90655c6cbddeb3671249b3895c135762";
   };
 
   propagatedBuildInputs = [ dateutil lxml ];
 
-  doCheck = true;
+  # No tests in archive
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Python module to generate ATOM feeds, RSS feeds and Podcasts.";

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

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.7.9";
+  version = "1.7.10.post1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fmdgpfnifaqfqwkfiwkpk19wmpi9avmh8a7jqylqi578jvp3fwi";
+    sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8";
   };
 
   buildInputs = [

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

@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "flake8";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8";
+    sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0";
   };
 
   buildInputs = [ pytest mock pytestrunner ];

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

@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.3.0";
+  version = "0.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7729ddd6766b9c5dab17b3709e2387935fd5c655872f1cbab7b7036474415217";
+    sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e";
   };
 
   postPatch = ''

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

@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.15.1";
+  version = "3.17.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2";
+    sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24";
     extension = "zip";
   };
 

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

@@ -11,11 +11,11 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ftfy";
   # latest is 5.1.1, buy spaCy requires 4.4.3
-  version = "4.4.3";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
+    sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";
   };
 
   propagatedBuildInputs = [ html5lib wcwidth];

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

@@ -13,10 +13,10 @@
 buildPythonPackage rec {
   pname = "gensim";
   name = "${pname}-${version}";
-  version = "2.3.0";
+  version = "3.0.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f";
+    sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650";
   };
 
   propagatedBuildInputs = [ smart_open numpy six scipy

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

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }:
+
+buildPythonPackage rec {
+  name = "gevent-1.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/gevent/${name}.tar.gz";
+    sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c";
+  };
+
+  # Why do we have this patch?
+  postPatch = ''
+    substituteInPlace libev/ev.c --replace \
+      "ecb_inline void ecb_unreachable (void) ecb_noreturn" \
+      "ecb_inline ecb_noreturn void ecb_unreachable (void)"
+  '';
+
+  buildInputs = [ libev ];
+  propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ];
+
+  checkPhase = ''
+    cd greentest
+    ${python.interpreter} testrunner.py
+  '';
+
+  # Bunch of failures.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Coroutine-based networking library";
+    homepage = http://www.gevent.org/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}

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

@@ -1,13 +1,13 @@
 { lib, buildPythonPackage, fetchPypi, six, pytest }:
 
 buildPythonPackage rec {
-  version = "3.1.1";
+  version = "3.1.2";
   name = "gflags-${version}";
 
   src = fetchPypi {
     inherit version;
     pname = "python-gflags";
-    sha256 = "0qvcizlz6r4511kl4jlg6fr34y1ka956dr2jj1q0qcklr94n9zxa";
+    sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2";
   };
 
   buildInputs = [ pytest ];

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "GPy";
-  version = "1.7.7";
+  version = "1.8.4";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b4siirlkqic1lsn9bi9mnp8fpbpw1ijwv0z2i6r2zdrk3d6szs1";
+    sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1";
   };
 
   # running tests produces "ImportError: cannot import name 'linalg_cython'"

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

@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gst-python";
-  version = "1.10.4";
+  version = "1.12.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r";
+    sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   passthru.pythonPath = [];
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "Python bindings for GStreamer";
 

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

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, enum34, hpack, hyperframe }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "h2";
+  version = "3.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj";
+  };
+
+  propagatedBuildInputs = [ enum34 hpack hyperframe ];
+
+  meta = with stdenv.lib; {
+    description = "HTTP/2 State-Machine based protocol implementation";
+    homepage = "http://hyper.rtfd.org/";
+    license = licenses.mit;
+  };
+}

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

@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "hidapi";
-  version = "0.7.99.post20";
+  version = "0.7.99.post21";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
+    sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97";
   };
 
   propagatedBuildInputs = [ libusb1 udev cython ];

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "hieroglyph";
-  version = "0.7.1";
+  version = "1.0.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
-    sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb";
+    sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c";
   };
 
   propagatedBuildInputs = [ sphinx ];

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

@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "htmlmin";
-  version = "0.1.10";
+  version = "0.1.11";
   name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63";
+    sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e";
   };
 
   # Tests run fine in a normal source checkout, but not when being built by nix.

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

@@ -5,7 +5,8 @@
 , markupsafe
 , decorator
 , itsdangerous
-, six }:
+, six
+}:
 
 buildPythonPackage rec {
   pname = "httpbin";
@@ -19,6 +20,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];
 
+  # No tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/kennethreitz/httpbin;
     description = "HTTP Request & Response Service";

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

@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "hyperframe";
+  version = "5.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2";
+  };
+
+  meta = with stdenv.lib; {
+    description = "HTTP/2 framing layer for Python";
+    homepage = "http://hyper.rtfd.org/";
+    license = licenses.mit;
+  };
+}

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

@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "6.1.0";
+  version = "6.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814";
+    sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608";
   };
 
   prePatch = lib.optionalString stdenv.isDarwin ''

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

@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname = "ipython_genutils";
+  version = "0.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
+  };
+
+  checkInputs = [ nose glibcLocales ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests
+  '';
+
+  meta = {
+    description = "Vestigial utilities from IPython";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}

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

@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "7.0.0";
+  version = "7.0.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd";
+    sha256 = "f98b4c3719097c9d2e6489f303db520b20bd4de3e0b1d6d4f92f81bfe3c2a0c8";
   };
 
   # Tests are not distributed

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

@@ -1,17 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
 
 buildPythonPackage rec {
   pname = "jedi";
-  version = "0.10.2";
+  version = "0.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e";
+    sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396";
   };
 
   checkInputs = [ pytest glibcLocales tox pytestcov ];
 
+  propagatedBuildInputs = [ parso ];
+
   checkPhase = ''
     LC_ALL="en_US.UTF-8" py.test test
   '';

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

@@ -6,26 +6,23 @@
 , numpydoc
 , isPy3k
 , stdenv
+, pytest
 }:
 
 
 buildPythonPackage rec {
   pname = "joblib";
   name = "${pname}-${version}";
-  version = "0.10.3";
+  version = "0.11";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d";
+    sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
   };
 
-  checkInputs = [ nose sphinx numpydoc ];
+  checkInputs = [ sphinx numpydoc pytest ];
 
-  # Failing test on Python 3.x and Darwin
-  postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) ''
-    sed -i -e '70,84d' joblib/test/test_format_stack.py
-    # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
-    # Not sure why but it's nix-specific. Try removing for new joblib releases.
-    rm joblib/test/test_parallel.py
+  checkPhase = ''
+    py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
   '';
 
   meta = {
@@ -33,4 +30,4 @@ buildPythonPackage rec {
     homepage = http://pythonhosted.org/joblib/;
     license = lib.licenses.bsd3;
   };
-}
+}

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

@@ -2,8 +2,8 @@
 
 buildPythonApplication rec {
   pname = "jsbeautifier";
-  version = "1.6.14";
-  name = "jsbeautifier-1.6.14";
+  version = "1.7.4";
+  name = "${pname}-${version}";
 
   propagatedBuildInputs = [ six ];
 
@@ -11,7 +11,7 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
-    sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
+    sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e";
   };
 
   meta = with stdenv.lib; {

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

@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, numpy
+, bottle, pyyaml, redis, six
+, zlib }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "Jug";
+  version = "1.6.4";
+  buildInputs = [ nose numpy ];
+  propagatedBuildInputs = [
+    bottle
+    pyyaml
+    redis
+    six
+
+    zlib
+  ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Task-Based Parallelization Framework";
+    license = licenses.mit;
+    url = https://jug.readthedocs.io/;
+    maintainers = with maintainers; [ luispedro ];
+  };
+}

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

@@ -0,0 +1,18 @@
+{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "kaitaistruct";
+  version = "0.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19j3snmr0qbd48f7yd3cc21ffv13dahf8ys591dnalbhvnkar71i";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Kaitai Struct: runtime library for Python";
+    homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
+    license = licenses.mit;
+  };
+}

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

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.8";
+  version = "2.0.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9";
+    sha256 = "6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767";
   };
 
   checkInputs = [

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

@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }:
+
+let
+  pname = "keyutils";
+  version = "0.5";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/k/${pname}/${name}.tar.gz";
+    sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10";
+  };
+
+  buildInputs = [ pkgs.keyutils pytestrunner ];
+
+  doCheck = false;
+
+  meta = {
+    description = "A set of python bindings for keyutils";
+    homepage = https://github.com/sassoftware/python-keyutils;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ primeos ];
+  };
+}

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

@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "2.4.41";
+  version = "2.4.45";
   name = "${pname}-${version}";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0";
+    sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e";
   };
 
   buildInputs = [ pytest ];

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

@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
+
+buildPythonPackage rec {
+  version = "2.3";
+  pname = "ldap3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0";
+  };
+
+  buildInputs = [ gssapi ];
+
+  propagatedBuildInputs = [ pyasn1 ];
+
+  doCheck = false; # requires network
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/ldap3;
+    description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
+    license = licenses.lgpl3;
+  };
+}