Merge branch 'master' into staging

pkgs/development/python-modules/absl-py/default.nix

@@ -1,7 +1,9 @@
 { buildPythonPackage
 , lib
+, pythonOlder
 , fetchPypi
 , six
+, enum34
 }:
 
 buildPythonPackage rec {
@@ -13,7 +15,11 @@ buildPythonPackage rec {
     sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [
+    six
+  ] ++ lib.optionals (pythonOlder "3.4") [
+    enum34
+  ];
 
   # checks use bazel; should be revisited
   doCheck = false;

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

@@ -10,11 +10,11 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a";
+    sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio

pkgs/development/python-modules/azure-mgmt-compute/default.nix

@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.3.1";
+  version = "0.20.0";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "5b0c2390af3e29d910e3d6e7a72b0be59d6e15933740dd193129217c000e4fed";
+    sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
   };
 
   preConfigure = ''

pkgs/development/python-modules/azure-mgmt-network/default.nix

@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.2.1";
+  version = "0.20.1";
   pname = "azure-mgmt-network";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "a4327bccc435ca4f829ac18f82f17923b490958c202af7a86044ccabeaaa5401";
+    sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
   };
 
   preConfigure = ''

pkgs/development/python-modules/azure-mgmt-nspkg/default.nix

@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.0.2";
+  version = "1.0.0";
   pname = "azure-mgmt-nspkg";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52";
+    sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
   };
 
   propagatedBuildInputs = [ azure-nspkg ];

pkgs/development/python-modules/azure-mgmt-resource/default.nix

@@ -7,13 +7,13 @@
 
 
 buildPythonPackage rec {
-  version = "2.0.0";
+  version = "0.20.1";
   pname = "azure-mgmt-resource";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2e83289369be88d0f06792118db5a7d4ed7150f956aaae64c528808da5518d7f";
+    sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
   };
 
   preConfigure = ''

pkgs/development/python-modules/azure-mgmt-storage/default.nix

@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.0.0";
+  version = "0.20.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "24c52b9dcb5e224ca9572d6ec39b53d332bdfe01818e85ec1cc1b5bedf16ce07";
+    sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
   };
 
   preConfigure = ''

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

@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi
+{ stdenv, fetchPypi, fetchpatch
 , buildPythonApplication, python, pythonOlder
 , mock, nose, pathpy, pyhamcrest, pytest
 , glibcLocales, parse, parse-type, six
@@ -13,6 +13,14 @@ buildPythonApplication rec {
     sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr";
   };
 
+  patches = [
+    # Fix tests on Python 2.7
+    (fetchpatch {
+      url = https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch;
+      sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy";
+    })
+  ];
+
   checkInputs = [ mock nose pathpy pyhamcrest pytest ];
   buildInputs = [ glibcLocales ];
   propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;

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

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , cheroot, contextlib2, portend, routes, six
 , setuptools_scm, zc_lockfile
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
@@ -9,6 +9,8 @@ buildPythonPackage rec {
   pname = "CherryPy";
   version = "18.0.1";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";

pkgs/development/python-modules/cli-helpers/default.nix

@@ -1,11 +1,13 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, configobj
 , terminaltables
 , tabulate
 , backports_csv
 , wcwidth
 , pytest
+, mock
 , isPy27
 }:
 
@@ -19,12 +21,13 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
+    configobj
     terminaltables
     tabulate
     wcwidth
   ] ++ (lib.optionals isPy27 [ backports_csv ]);
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest mock ];
 
   checkPhase = ''
     py.test

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

@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.0.1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32fad615d773e9b5a9394c078ddc2c868e64e35f1ac9633ff90b456901b9d886";
+    sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs

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

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "1.11.16";
+  version = "1.11.17";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9";
+    url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
+    sha256 = "10xlpm21ll8mgz5py41sz9vrd603qv7an736agbqxkxlyikfx1x7";
   };
 
   patches = stdenv.lib.optionals withGdal [
@@ -34,8 +34,9 @@ buildPythonPackage rec {
   # too complicated to setup
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high-level Python Web framework";
     homepage = https://www.djangoproject.com/;
+    license = licenses.bsd3;
   };
 }

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

@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   name = "Django-${version}";
-  version = "1.8.18";
-  disabled = pythonOlder "2.7";
+  version = "1.8.19";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-    sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7";
+    sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
   };
 
   # too complicated to setup

pkgs/development/python-modules/django/2_1.nix

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.1.3";
+  version = "2.1.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05k990b9zbj0nfkdcn13f5hg7ppfx9vffz5s0m66imd3mmlb5yhz";
+    sha256 = "1mxbrqdzim3xcy18dmd08xh2am0q7whbf0nf6bmnrl43802m3386";
   };
 
   patches = stdenv.lib.optionals withGdal [

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "dominate";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8dfcca2bde3937a2d03db6e55efcb0c0dea0d4ab0923dc983d794b19e9247328";
+    sha256 = "0lda2a4nxxh9wp727vhn31rl5v7y9fxkscdjawg7gzj50xf76xj0";
   };
 
   doCheck = !isPy3k;

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

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "9.1.0";
+  version = "9.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j6p5hgbglpwqd4jl53iqs83537464lybzc0aszi3w6wm6i0dlyq";
+    sha256 = "121wn4l6f6r4vm7yq0y9d1xsn5y77l6a4vgakyy2yaz8wv6j9w7c";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.

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

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "elpy";
-  version = "1.26.0";
+  version = "1.27.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1m3dk609sn1j8zk8xwrlgcw82vkpws4q4aypv2ljpky9lm36npv6";
+    sha256 = "0fpxxmxjzcam3kharbmvprf4kagspya1rx9piacmxbgcp6w2lc4s";
   };
 
   propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]

pkgs/development/python-modules/facebook-sdk/default.nix

@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "facebook-sdk";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f3d450ec313b62d3716fadc4e5098183760e1d2a9e0434a94b74e59ea6ea3e4d";
+    sha256 = "138grz0n6plzdqgi4h6hhszf58bsvx9v76cwj51g1nd3kvkd5g6a";
   };
 
   propagatedBuildInputs = [ requests ];

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

@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  requests, mt-940, sepaxml, bleach, isPy3k }:
+
+buildPythonPackage rec {
+  version = "2.0.0";
+  pname = "fints";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1";
+  };
+
+  propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
+
+  # no tests included in PyPI package
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/raphaelm/python-fints/;
+    description = "Pure-python FinTS (formerly known as HBCI) implementation";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}

pkgs/development/python-modules/flask-migrate/default.nix

@@ -4,11 +4,11 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19rxhva9i5n643vm3d11f8p98jwai2pavysa217p5w5h5cnksnx2";
+    sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3";
   };
 
   checkInputs = optional isPy3k glibcLocales;

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

@@ -28,14 +28,15 @@ buildPythonPackage rec {
   };
 
   disabled = !isPy3k;
-  propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36;
+  propagatedBuildInputs = [ docutils requests requests_download pytoml ]
+    ++ lib.optional (pythonOlder "3.6") zipfile36;
 
   checkInputs = [ pytest testpath responses ];
 
   # Disable test that needs some ini file.
   # Disable test that wants hg
   checkPhase = ''
-    py.test -k "not test_invalid_classifier and not test_build_sdist"
+    HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist"
   '';
 
   meta = {

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

@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08681be47b1861221bc7cf17b6e368a8d734db81682d716c22a11e839f47cb79";
+    sha256 = "04mhdl3k644j45rlfkamxz1paf58fxrmnwgvkrvza2fcwcs4nr9n";
   };
 
   checkInputs = [ pytest nbconvert pandas mock ];

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

@@ -1,18 +1,19 @@
-{ stdenv
+{ lib
+, pythonOlder
 , buildPythonPackage
 , fetchPypi
-, unittest2
-, pytest
-, mock
 , betamax
+, pytest
 , betamax-matchers
-, dateutil
+, unittest2
+, mock
 , requests
-, pyopenssl
 , uritemplate
+, dateutil
+, jwcrypto
+, pyopenssl
 , ndg-httpsclient
 , pyasn1
-, jwcrypto
 }:
 
 buildPythonPackage rec {
@@ -24,18 +25,19 @@ buildPythonPackage rec {
     sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af";
   };
 
-  buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ];
+  checkInputs = [ betamax pytest betamax-matchers ]
+    ++ lib.optional (pythonOlder "3") unittest2
+    ++ lib.optional (pythonOlder "3.3") mock;
   propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ];
 
   postPatch = ''
-    sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py
     sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py
   '';
 
   # TODO: only disable the tests that require network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://github3py.readthedocs.org/en/master/;
     description = "A wrapper for the GitHub API written in python";
     license = licenses.bsd3;

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

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-vision";
-  version = "0.34.0";
+  version = "0.35.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "50392b2c68e40dbf725c531ba4d325bd910da6441a472ed0a3fadfd0ab8548f7";
+    sha256 = "0hx80q8rcgs0kvhv0xix2dhr3n19abac4sj4k5pfqxh6qzdxm3d8";
   };
 
   checkInputs = [ pytest mock ];

pkgs/development/python-modules/graphite-web/default.nix

@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, which
 , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir
 }:
-if django.version != "1.8.18"
+if django.version != "1.8.19"
 || django_tagging.version != "0.4.3"
 then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3"
 else buildPythonPackage rec {

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

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , ipython
 , jupyter_client
 , traitlets
@@ -23,6 +24,14 @@ buildPythonPackage rec {
   checkInputs = [ pytest nose ];
   propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
 
+  # https://github.com/ipython/ipykernel/pull/377
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/ipython/ipykernel/commit/a3bf849dbd368a1826deb9dfc94c2bd3e5ed04fe.patch";
+      sha256 = "1yhpwqixlf98a3n620z92mfips3riw6psijqnc5jgs2p58fgs2yc";
+    })
+  ];
+
   checkPhase = ''
     HOME=$(mktemp -d) pytest ipykernel
   '';

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

@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, testfixtures
+, pyyaml
+, mock
+, nbformat
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "jupytext";
+  version = "0.8.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1m35m9z4vy480d2200nd4lk9n5s4z3zcnq0d9rdlh4yv5264mrgf";
+  };
+
+  propagatedBuildInputs = [
+    pyyaml
+    nbformat
+    testfixtures
+  ];
+  checkInputs = [
+    pytest
+  ];
+  # setup.py checks for those even though they're not needed at runtime (only
+  # for tests), thus not propagated
+  buildInputs = [
+    mock
+    pytest
+  ];
+
+  # requires test notebooks which are not shipped with the pypi release
+  doCheck = false;
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts";
+    homepage = https://github.com/mwouts/jupytext;
+    license = licenses.mit;
+    maintainers = with maintainers; [ timokau ];
+  };
+}

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

@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
 
 buildPythonPackage rec {
-  version = "1.4.3";
+  version = "1.4.4";
   pname = "kafka-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "078acdcd1fc6eddacc46d437c664998b4cf7613b7e79ced66a460965f2648f88";
+    sha256 = "1p9sr9vl96xz8qrgdrjiql9qkch2qx29pkq7igk28clgc6zbn510";
   };
 
   checkInputs = [ pytest six mock ];

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

@@ -19,7 +19,10 @@ buildPythonPackage rec {
   #
   # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket
   # on the x86_64-darwin builder.
-  doCheck = stdenv.isLinux;
+  #
+  # TODO: change this back to `doCheck = stdenv.isLinux` after
+  # https://github.com/ionelmc/python-manhole/issues/54 is fixed
+  doCheck = false;
 
   checkInputs = [ pytest requests process-tests ];
   checkPhase = ''

pkgs/development/python-modules/mt-940/default.nix

@@ -1,35 +1,37 @@
-{ buildPythonPackage, stdenv, pytestrunner, pyyaml, pytest, enum34
-, pytestpep8, pytestflakes,fetchFromGitHub, isPy3k, lib, glibcLocales
+{ buildPythonPackage, stdenv, pyyaml, pytest, enum34
+, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales
 }:
 
 buildPythonPackage rec {
-  version = "4.10.0";
-  pname = "mt940";
+  version = "4.12.2";
+  pname = "mt-940";
 
   src = fetchFromGitHub {
     owner = "WoLpH";
-    repo = pname;
+    repo = "mt940";
     rev = "v${version}";
-    sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65";
+    sha256 = "0l7q8v00dhpbc9mh6baaaqc55kf44rszygx28dq3pwp5b5x33nir";
   };
 
-  patches = [
-    ./no-coverage.patch
-  ];
+  postPatch = ''
+    # No coverage report
+    sed -i "/--\(no-\)\?cov/d" pytest.ini
+  '';
 
-  propagatedBuildInputs = [ pyyaml pytestrunner ]
-    ++ lib.optional (!isPy3k) enum34;
+  propagatedBuildInputs = lib.optional (!isPy3k) enum34;
 
   LC_ALL="en_US.UTF-8";
 
-  checkInputs = [ pytestpep8 pytestflakes pytest glibcLocales ];
+  checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ];
+
+  # See https://github.com/WoLpH/mt940/issues/64 for the disabled test
   checkPhase = ''
-    py.test
+    py.test -k "not mt940.models.FixedOffset"
   '';
 
   meta = with stdenv.lib; {
     description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
-    homepage = https://pythonhosted.org/mt-940/;
+    inherit (src.meta) homepage;
     license = licenses.bsd3;
   };
 }

pkgs/development/python-modules/mt-940/no-coverage.patch

@@ -1,26 +0,0 @@
-diff --git a/pytest.ini b/pytest.ini
-index fef28f5..f366331 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -4,10 +4,6 @@ python_files =
-     tests/*.py
- 
- addopts =
--    --cov mt940
--    --cov-report term-missing
--    --cov-report html
--    --no-cov-on-fail
-     --doctest-modules
-     --pep8
-     --flakes
-diff --git a/tests/requirements.txt b/tests/requirements.txt
-index fc55572..e52cc28 100644
---- a/tests/requirements.txt
-+++ b/tests/requirements.txt
-@@ -3,6 +3,5 @@
- -r ../docs/requirements.txt
- pytest
- pytest-cache
--pytest-cover
- pytest-flakes
- pytest-pep8

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

@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "mysqlclient";
-  version = "1.3.13";
+  version = "1.3.14";
 
   buildInputs = [
     mysql.connector-c
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f";
+    sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/nose-randomly/default.nix

@@ -19,6 +19,10 @@ buildPythonPackage rec {
     nose
   ];
 
+  checkPhase = ''
+    nosetests
+  '';
+
   meta = with lib; {
     description = "Nose plugin to randomly order tests and control random.seed";
     homepage = https://github.com/adamchainz/nose-randomly;

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

@@ -3,7 +3,6 @@
 , fetchPypi
 , python
 , numpy
-, llvmPackages ? null
 }:
 
 buildPythonPackage rec {
@@ -16,16 +15,11 @@ buildPythonPackage rec {
   };
 
   # Remove existing site.cfg, use the one we built for numpy.
-  # Somehow openmp needs to be added to LD_LIBRARY_PATH
-  # https://software.intel.com/en-us/forums/intel-system-studio/topic/611682
   preBuild = ''
     rm site.cfg
     ln -s ${numpy.cfg} site.cfg
-    export LD_LIBRARY_PATH=${llvmPackages.openmp}/lib
   '';
 
-  buildInputs = [] ++ lib.optional (numpy.blasImplementation == "mkl") llvmPackages.openmp;
-
   propagatedBuildInputs = [ numpy ];
 
   # Run the test suite.
@@ -47,4 +41,4 @@ buildPythonPackage rec {
     homepage = "https://github.com/pydata/numexpr";
     license = lib.licenses.mit;
   };
-}
+}

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

@@ -71,8 +71,6 @@ in buildPythonPackage rec {
     inherit blasImplementation cfg;
   };
 
-  doCheck = blasImplementation != "mkl";
-
   # Disable two tests
   # - test_f2py: f2py isn't yet on path.
   # - test_large_file_support: takes a long time and can cause the machine to run out of disk space

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

@@ -1,8 +1,9 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgs
 , isPyPy
+, graphviz
+, mock
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,9 @@ buildPythonPackage rec {
   # Tests fail with PyPy.
   disabled = isPyPy;
 
-  propagatedBuildInputs = [pkgs.graphviz];
+  propagatedBuildInputs = [ graphviz ];
+
+  checkInputs = [ mock ];
 
   meta = with stdenv.lib; {
     description = "Draws Python object reference graphs with graphviz";

pkgs/development/python-modules/path.py/default.nix

@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
-, pytestrunner
 , pytest
+, pytest-flake8
 , glibcLocales
 , packaging
 , isPy27
@@ -14,14 +14,13 @@
 buildPythonPackage rec {
   pname = "path.py";
   version = "11.5.0";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "b6687a532a735a2d79a13e92bdb31cb0971abe936ea0fa78bcb47faf4372b3cb";
   };
 
-  checkInputs = [ pytest pytestrunner glibcLocales packaging ];
+  checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [
     importlib-metadata
@@ -37,8 +36,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = ''
-    # Ignore pytest configuration
-    rm pytest.ini
-    py.test test_path.py
+    # ignore performance test which may fail when the system is under load
+    py.test -v -k 'not TestPerformance'
   '';
 }

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

@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytz
+, six
 }:
 
 buildPythonPackage rec {
@@ -13,10 +14,10 @@ buildPythonPackage rec {
     sha256 = "18192d90409a3037619ef17f1924e3fd9c7169c9c1b3277cec1982116ec2b6de";
   };
 
-  propagatedBuildInputs = [ pytz ];
+  propagatedBuildInputs = [ pytz six ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/realazthat/aiopg8000;
+    homepage = https://github.com/mfenniak/pg8000;
     description = "PostgreSQL interface library, for asyncio";
     maintainers = with maintainers; [ garbas domenkozar ];
     platforms = platforms.linux;

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

@@ -1,16 +1,30 @@
-{ buildPythonPackage, stdenv, lxml, click, fetchPypi }:
+{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
 
 buildPythonPackage rec {
   version = "0.3.13";
   pname = "pyaxmlparser";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1mzdrifnaky57vkmdvg0rgjss55xkxaramci3wpv4h65lmk95988";
+  # the PyPI tarball doesn't ship tests.
+  src = fetchFromGitHub {
+    owner = "appknox";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0jfjhxc6b57npsidknxmhj1x813scg47aaw90ybyr90fpdz5rlwk";
   };
 
+  disabled = !isPy3k;
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "click==6.7" "click"
+  '';
+
   propagatedBuildInputs = [ lxml click ];
 
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test tests/
+  '';
+
   meta = with stdenv.lib; {
     description = "Python3 Parser for Android XML file and get Application Name without using Androguard";
     homepage = https://github.com/appknox/pyaxmlparser;

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

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, nose, numpy }:
+{ lib, buildPythonPackage, fetchPypi, cython, nose, numpy }:
 
 buildPythonPackage rec {
   pname = "pyjet";
@@ -9,6 +9,15 @@ buildPythonPackage rec {
     sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg";
   };
 
+  # fix for python37
+  # https://github.com/scikit-hep/pyjet/issues/8
+  nativeBuildInputs = [ cython ];
+  preBuild = ''
+    for f in pyjet/src/*.{pyx,pxd}; do
+      cython --cplus "$f"
+    done
+  '';
+
   propagatedBuildInputs = [ numpy ];
   checkInputs = [ nose ];
 

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

@@ -2,20 +2,21 @@
 , buildPythonPackage
 , fetchurl
 , isPyPy
-, pkgs
+, liblo
+, cython
 }:
 
 buildPythonPackage rec {
   pname = "pyliblo";
-  version = "0.9.2";
+  version = "0.10.0";
   disabled = isPyPy;
 
   src = fetchurl {
     url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
-    sha256 = "382ee7360aa00aeebf1b955eef65f8491366657a626254574c647521b36e0eb0";
+    sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw";
   };
 
-  propagatedBuildInputs = [ pkgs.liblo ];
+  buildInputs = [ liblo cython ];
 
   meta = with stdenv.lib; {
     homepage = http://das.nasophon.de/pyliblo/;

pkgs/development/python-modules/pyqt/5.x.nix

@@ -65,6 +65,7 @@ in buildPythonPackage {
   '';
 
   postInstall = ''
+    ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
     done

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

@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.9.0";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "raven-python";
     rev = version;
-    sha256 = "1kggp34i8gqi47khca2v5n2i32zrg66m1pga6c00yqmlbv74d84v";
+    sha256 = "16x9ldl8cy7flw5kh7qmgbmflqyf210j3q6ac2lw61sgwajsnvw8";
   };
 
   # way too many dependencies to run tests

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

@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, typing
 , ruamel_ordereddict
 , isPy3k
 }:
@@ -19,7 +18,7 @@ buildPythonPackage rec {
   # Tests cannot load the module to test
   doCheck = false;
 
-  propagatedBuildInputs = [ ruamel_base typing ]
+  propagatedBuildInputs = [ ruamel_base ]
     ++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict;
 
   meta = with stdenv.lib; {

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

@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore,
   testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
-  service-identity, parsel, pydispatcher, cssselect, lib }:
+  service-identity, parsel, pydispatcher, cssselect, lib, fetchpatch }:
 buildPythonPackage rec {
   version = "1.5.1";
   pname = "Scrapy";
@@ -10,18 +10,26 @@ buildPythonPackage rec {
     six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
   ];
 
-  # Scrapy is usually installed via pip where copying all
-  # permissions makes sense. In Nix the files copied are owned by
-  # root and readonly. As a consequence scrapy can't edit the
-  # project templates.
-  patches = [ ./permissions-fix.patch ];
+  patches = [
+    # Scrapy is usually installed via pip where copying all
+    # permissions makes sense. In Nix the files copied are owned by
+    # root and readonly. As a consequence scrapy can't edit the
+    # project templates.
+    ./permissions-fix.patch
+    # fix python37 issues. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/scrapy/scrapy/commit/f4f39057cbbfa4daf66f82061e57101b88d88d05.patch;
+      sha256 = "1f761qkji362i20i5bzcxz44sihvl29prm02i5l2xyhgl1hp91hv";
+    })
+  ];
 
   LC_ALL="en_US.UTF-8";
 
+  # Ignore proxy tests because requires mitmproxy
+  # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean"
+  # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396
   checkPhase = ''
-    py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"}
-    # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
-    # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396
+    pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"}
   '';
 
   src = fetchPypi {
@@ -29,11 +37,17 @@ buildPythonPackage rec {
     sha256 = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6";
   };
 
+  postInstall = ''
+    install -m 644 -D extras/scrapy.1 $out/share/man/man1/scrapy.1
+    install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy
+    install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
+  '';
+
   meta = with lib; {
     description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
     homepage = https://scrapy.org/;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ drewkett ];
+    maintainers = with maintainers; [ drewkett marsam ];
     platforms = platforms.unix;
   };
 }

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

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  version = "2.0.0";
+  pname = "sepaxml";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0jhj8fa0lbyaw15q485kyyli9qgrmqr47a6z6pgqm40kwmjghiyc";
+  };
+
+  # no tests included in PyPI package
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/raphaelm/python-sepaxml/;
+    description = "SEPA Direct Debit XML generation in python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}

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

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, coverage }:
+{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "sh";
@@ -9,10 +9,19 @@ buildPythonPackage rec {
     sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
   };
 
-  checkInputs = [ coverage ];
+  # Disable tests that fail on Darwin
+  # Some of the failures are due to Nix using GNU coreutils
+  patches = [ ./disable-broken-tests-darwin.patch ];
+
+  postPatch = ''
+    sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py
+  '';
+
+  checkInputs = [ coverage lsof glibcLocales ];
 
   # A test needs the HOME directory to be different from $TMPDIR.
   preCheck = ''
+    export LC_ALL="en_US.UTF-8"
     HOME=$(mktemp -d)
   '';
 

pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch

@@ -0,0 +1,49 @@
+From 264f2f6a04d25156bba43524a6b172d2e99c53f4 Mon Sep 17 00:00:00 2001
+From: Ben Wolsieffer <benwolsieffer@gmail.com>
+Date: Fri, 21 Dec 2018 17:39:45 -0500
+Subject: [PATCH] Disable tests that fail on OSX.
+
+Some of the failures are due to the use of GNU ls.
+---
+ test.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test.py b/test.py
+index 68ef40c..2f53360 100644
+--- a/test.py
++++ b/test.py
+@@ -352,6 +352,7 @@ exit(3)
+         self.assertEqual(sed(_in="one test three", e="s/test/two/").strip(),
+                 "one two three")
+ 
++    @not_osx
+     def test_ok_code(self):
+         from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2
+ 
+@@ -498,6 +499,7 @@ while True:
+         self.assertEqual(out, match)
+ 
+ 
++    @not_osx
+     def test_environment(self):
+         """ tests that environments variables that we pass into sh commands
+         exist in the environment, and on the sh module """
+@@ -861,6 +863,7 @@ print(sys.argv[1])
+         self.assertTrue(now - start > sleep_time)
+ 
+ 
++    @not_osx
+     def test_background_exception(self):
+         from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2
+         p = ls("/ofawjeofj", _bg=True) # should not raise
+@@ -2036,6 +2039,7 @@ else:
+         self.assertEqual(p, "test")
+ 
+ 
++    @not_osx
+     def test_signal_exception(self):
+         from sh import SignalException_15
+ 
+-- 
+2.20.0
+

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

@@ -14,6 +14,7 @@ buildPythonPackage rec {
 
   configurePhase = ''
     ${python.executable} ./configure.py \
+      --sip-module PyQt5.sip \
       -d $out/lib/${python.libPrefix}/site-packages \
       -b $out/bin -e $out/include
   '';

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

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, requests
+, lxml
+, beautifulsoup4
+}:
+
+buildPythonPackage rec {
+  pname = "snscrape";
+  version = "0.1.3";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mnhqqc7xfwg2wrzpj1pjbcisjjwxrgmy21f53p80xbx2iz8b9n1";
+  };
+
+  # There are no tests; make sure the executable works.
+  checkPhase = ''
+    export PATH=$PATH:$out/bin
+    snscrape --help
+  '';
+
+  propagatedBuildInputs = [ requests lxml beautifulsoup4 ];
+
+  meta = with lib; {
+    homepage = https://github.com/JustAnotherArchivist/snscrape;
+    description = "A social networking service scraper in Python";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ivan ];
+  };
+}

pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix

@@ -3,12 +3,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.1";
   pname = "sphinxcontrib-bibtex";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cb9fb4526642fc080204fccd5cd8f41e9e95387278e17b1d6969b1e27c2d3e0c";
+    sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr";
   };
 
   propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "thumbor";
-  version = "6.5.2";
+  version = "6.6.0";
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
@@ -16,14 +16,14 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1ys5ymwbvgh2ir85g9nyrzzf8vgi16j6pzzi53b0rgjx0kwlmnxg";
+    sha256 = "0m4q40fcha1aydyr1khjhnb08cdfma67yxgyhsvwar5a6sl0906i";
   };
 
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
-    substituteInPlace "setup.py" \
-      --replace "piexif>=1.0.13,<1.1.0" "piexif>=1.0.13"
+    sed -i setup.py \
+        -e 's/piexif[^"]*/piexif/;s/Pillow[^"]*/Pillow/'
     substituteInPlace "tests/test_utils.py" \
       --replace "/bin/ls" "${coreutils}/bin/ls"
     substituteInPlace "tests/detectors/test_face_detector.py" \

pkgs/development/python-modules/typed-ast/default.nix

@@ -1,10 +1,10 @@
 { buildPythonPackage, fetchPypi, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.1.0";
+  version = "1.1.1";
   src = fetchPypi{
     inherit pname version;
-    sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa";
+    sha256 = "1iml3lcw50bz1fyw7s9sa4mqzbmqs5w43k6bsv5ix4vqa34mvckc";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";

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

@@ -1,22 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "uritemplate.py";
-  version = "3.0.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e0cdeb0f55ec18e1580974e8017cd188549aacc2aba664ae756adb390b9d45b4";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/uri-templates/uritemplate-py;
-    description = "Python implementation of URI Template";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pSub ];
-  };
-
-}

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

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, six, h2
 , isPy3k
 }:
 
@@ -15,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a";
   };
 
-  propagatedBuildInputs = [ ];
+  propagatedBuildInputs = [ six h2 ];
 
   meta = {
     description = "A webserver intended for web browser testing";

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

@@ -25,11 +25,11 @@
 
 buildPythonPackage rec {
   pname = "zeep";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2d96881689c3f29e8ea5c8c6abb2b17fb0f470deee15d0d7bec4e74592850f6";
+    sha256 = "0bfpdy3hi8aa45piwg5gj0xxa187v13d66qr1ki73qn7c6rbizp5";
   };
 
   propagatedBuildInputs = [