Merge branch 'master' into staging-next

There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940

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

@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = http://babel.edgewall.org;
     description = "A collection of tools for internationalizing Python applications";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -22,6 +22,6 @@ buildPythonPackage rec {
     homepage = http://pygments.org/;
     description = "A generic syntax highlighter";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ garbas ];
+    maintainers = with lib.maintainers; [ ];
   };
-}
+}

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

@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Terminal MUA using notmuch mail";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "astor";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d";
+    sha256 = "0qkq5bf13fqcwablg0nk7rx83izxdizysd42n26j5wbingcfx9ip";
   };
 
   # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89

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

@@ -71,6 +71,6 @@ buildPythonPackage rec {
 
   meta = {
     description = "A Session and Caching library with WSGI Middleware";
-    maintainers = with lib.maintainers; [ garbas domenkozar ];
+    maintainers = with lib.maintainers; [ domenkozar ];
   };
 }

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

@@ -13,6 +13,6 @@ buildPythonPackage rec {
     homepage = https://pythonhosted.org/blinker/;
     description = "Fast, simple object-to-object and broadcast signaling";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch

@@ -1,30 +0,0 @@
-From e7ed770363e8769727a915b2390c0ce1ab2ce964 Mon Sep 17 00:00:00 2001
-From: Michal Hlavinka <mhlavink@redhat.com>
-Date: Wed, 18 Jun 2014 20:07:24 -0400
-Subject: tests: Fix cookie comparison on rawhide
-
-Cookie comments changed, so just strip them out
-
-(crobinso: Add commit message, make change more readable)
-
-diff --git a/tests/misc.py b/tests/misc.py
-index 4b4f99d..12da806 100644
---- a/tests/misc.py
-+++ b/tests/misc.py
-@@ -83,7 +83,12 @@ class MiscAPI(unittest.TestCase):
- 
-         # Mozilla should be converted inplace to LWP
-         bugzilla.Bugzilla3(url=None, cookiefile=cookiesnew)
--        self.assertEquals(open(cookiesmoz).read(), open(cookiesnew).read())
-+
-+        def strip_comments(content):
-+            return [l for l in content.split("\n") if not l.startswith("#")]
-+        self.assertEquals(
-+            strip_comments(open(cookiesmoz).read()),
-+            strip_comments(open(cookiesnew).read()))
- 
-         # Make sure bad cookies raise an error
-         try:
--- 
-cgit v0.10.2
-

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

@@ -6,12 +6,11 @@ buildPythonPackage rec {
   version = "2.2.0";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ikx21nm7cch4lz9agv5h1hx6zvg2alkpfdrl01khqgilhsicdhi";
+    pname = "python-${pname}";
+    inherit version;
+    sha256 = "0x3jjb1g5bgjdj0jf0jmcg80hn5x2isf49frwvf2ykdl3fxd5gxc";
   };
 
-  patches = [ ./checkPhase-fix-cookie-compare.patch ];
-
   buildInputs = [ pep8 coverage logilab_common ];
   propagatedBuildInputs = [ requests ];
 
@@ -21,10 +20,10 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://fedorahosted.org/python-bugzilla/;
+    homepage = https://github.com/python-bugzilla/python-bugzilla;
     description = "Bugzilla XMLRPC access module";
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ pierron ];
+    maintainers = with maintainers; [ pierron peti ];
   };
 }

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

@@ -13,6 +13,6 @@ buildPythonPackage rec {
     homepage = http://www.buildout.org;
     description = "A software build and configuration system";
     license = licenses.zpl21;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
     homepage = https://chameleon.readthedocs.io/;
     description = "Fast HTML/XML Template Compiler";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -3,16 +3,14 @@
 
 buildPythonPackage rec {
   pname = "cleo";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "58d26642fa608a1515093275cd98875100c7d50f01fc1f3bbb7a78dbb73e4b14";
+    sha256 = "0d0sxca308ilp73jdny4frn93asr4ih87xxl1d9rxf8m12xssa3c";
   };
 
   propagatedBuildInputs = [
-    pylev
-    pastel
     clikit
   ];
 

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

@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "clikit";
-  version = "0.2.4";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6807cf4a41e6b981b056075c0aefca2db1dabc597ed18fa4d92b8b2e2678835";
+    sha256 = "0f8ba0kbka208faxdlny8byqb2w2cdyspq73zalymq8vr91796lp";
   };
 
   propagatedBuildInputs = [

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

@@ -16,6 +16,6 @@ buildPythonPackage rec {
     description = "A simple schema-based serialization and deserialization library";
     homepage = https://docs.pylonsproject.org/projects/colander/en/latest/;
     license = licenses.free; # http://repoze.org/LICENSE.txt
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 }

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

@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Config file reading, writing and validation";
     homepage = https://pypi.python.org/pypi/configobj;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Form library with advanced features like nested forms";
     homepage = https://docs.pylonsproject.org/projects/deform/en/latest/;
     license = licenses.free; # http://www.repoze.org/LICENSE.txt
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 }

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

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "1.11.21";
+  version = "1.11.22";
 
   src = fetchurl {
     url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "0adhcw8sx2mgwk9y2j760y96pqbip1ni3sf2v2ls5zxc9x93wwms";
+    sha256 = "0if8p7sgbvpy3m8d25pw1x232s14ndd60w5s5d88jl3hl505s3c3";
   };
 
   patches = stdenv.lib.optionals withGdal [

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

@@ -28,6 +28,9 @@ buildPythonPackage rec {
       # The patches were not backported due to Django 1.8 having reached EOL
       https://www.djangoproject.com/weblog/2018/aug/01/security-releases/
       https://www.djangoproject.com/weblog/2019/jan/04/security-releases/
+      https://www.djangoproject.com/weblog/2019/feb/11/security-releases/
+      https://www.djangoproject.com/weblog/2019/jun/03/security-releases/
+      https://www.djangoproject.com/weblog/2019/jul/01/security-releases/
     ];
   };
 

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

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.1.9";
+  version = "2.1.10";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nkqylj6hz7k45mvwch2y5cc06ncnzbxnzw2d7vbv10azzsdwljh";
+    sha256 = "0n794x17x8q2jzjm12glb900y53r3bxg8dafvl65djiglm4abqk5";
   };
 
   patches = stdenv.lib.optionals withGdal [

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

@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.2.2";
+  version = "2.2.3";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xbqsa016szsqx6pnggrlxs81169hd8adzmdvp969007xg9k0gbm";
+    sha256 = "1sn0a7yjipwxrplh1x4kr77a93xzik1inh07bxwaqaw94qdzc8sd";
   };
 
   patches = stdenv.lib.optional withGdal

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

@@ -33,6 +33,6 @@ buildPythonPackage rec {
   meta = {
     description = "Docutils -- Python Documentation Utilities";
     homepage = http://docutils.sourceforge.net/;
-    maintainers = with lib.maintainers; [ garbas AndersonTorres ];
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }

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

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "9.3.0";
+  version = "9.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ckpbksdby70d70m58b904h8y8v7m82h12n3q3qk58r4yrqwvld5";
+    sha256 = "0qid094qna6bl4zpd08f6snvipwjls1yadacvmwri11djgp0wvj3";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.

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

@@ -18,6 +18,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Standalone version of django.utils.feedgenerator, compatible with Py3k";
     homepage = https://github.com/dmdm/feedgenerator-py3k.git;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Code checking using pep8 and pyflakes";
     homepage = https://pypi.python.org/pypi/flake8;
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
     homepage = https://github.com/aliles/funcsigs;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
     license = licenses.asl20;
   };
 }

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

@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Backport of the concurrent.futures package from Python 3.2";
     homepage = "https://github.com/agronholm/pythonfutures";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [  ];
   };
 }

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

@@ -0,0 +1,29 @@
+{ buildPythonPackage, lib, fetchPypi, isPy27
+, ipaddress
+, maxminddb
+, mock
+, requests
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  version = "2.9.0";
+  pname = "geoip2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w7cay5q6zawjzivqbwz5cqx1qbdjw6kbriccb7l46p7b39fkzzp";
+  };
+
+  propagatedBuildInputs = [ requests maxminddb ]
+    ++ lib.optionals isPy27 [ ipaddress ];
+
+  checkInputs = [ requests-mock ];
+
+  meta = with lib; {
+    description = "MaxMind GeoIP2 API";
+    homepage = "https://www.maxmind.com/en/home";
+    license = licenses.apsl20;
+    maintainers = with maintainers; [ ];
+  };
+}

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

@@ -16,6 +16,6 @@ buildPythonPackage rec {
     homepage = http://code.google.com/p/httplib2;
     description = "A comprehensive HTTP client library";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = https://github.com/davidhalter/jedi;
     description = "An autocompletion tool for Python that can be used for text editors";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/jenkins-job-builder/default.nix

@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
     homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
     license = licenses.asl20;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 
 }

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

@@ -26,6 +26,6 @@ buildPythonPackage rec {
       Django inspired non-XML syntax but supports inline expressions and
       an optional sandboxed environment.
     '';
-    maintainers = with maintainers; [ pierron garbas sjourdois ];
+    maintainers = with maintainers; [ pierron sjourdois ];
   };
 }

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

@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, colorama }:
+
+buildPythonPackage rec {
+  pname = "loguru";
+  version = "0.3.0";
+  
+  disabled = isPy27;
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b2phizcx2wbdm5np0s16yd68fc0isqnm8qs6l9pmlrlyf9gm87j";
+  };
+
+  checkInputs = [ pytest colorama ];
+  checkPhase = ''
+    pytest -k 'not test_time_rotation_reopening'
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/Delgan/loguru;
+    description = "Python logging made (stupidly) simple";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jakewaksbaum ];
+  };
+}

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
     description = "Implements a XML/HTML/XHTML Markup safe string";
     homepage = http://dev.pocoo.org;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ domenkozar garbas ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -22,14 +22,14 @@ assert enableTk -> (tcl != null)
 assert enableQt -> pyqt4 != null;
 
 buildPythonPackage rec {
-  version = "3.0.3";
+  version = "3.1.1";
   pname = "matplotlib";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dzpgpj34i6lv9wgacqdshai2d237m3vymqrgl52sj1gwf4kblz1";
+    sha256 = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

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

@@ -0,0 +1,26 @@
+{ buildPythonPackage, lib, fetchPypi
+, ipaddress
+, mock
+, nose
+}:
+
+buildPythonPackage rec {
+  version = "1.4.1";
+  pname = "maxminddb";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04mpilsj76m29id5xfi8mmasdmh27ldn7r0dmh2rj6a8v2y5256z";
+  };
+
+  propagatedBuildInputs = [ ipaddress ];
+
+  checkInputs = [ nose mock ];
+
+  meta = with lib; {
+    description = "Reader for the MaxMind DB format";
+    homepage = "https://www.maxmind.com/en/home";
+    license = licenses.apsl20;
+    maintainers = with maintainers; [ ];
+  };
+}

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

@@ -15,6 +15,6 @@ buildPythonPackage rec {
     description = "McCabe checker, plugin for flake8";
     homepage = https://github.com/flintwork/mccabe;
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -22,7 +22,7 @@ buildPythonPackage rec {
     description = "A Python wrapper around notmuch";
     homepage = https://notmuchmail.org/;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 
 }

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

@@ -25,7 +25,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/simplegeo/python-oauth2";
     description = "Library for OAuth version 1.0";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
   };
 

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

@@ -15,7 +15,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 
 }

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

@@ -65,6 +65,6 @@ buildPythonPackage rec {
     description = "A tool to generate a static blog from reStructuredText or Markdown input files";
     homepage = http://getpelican.com/;
     license = licenses.agpl3;
-    maintainers = with maintainers; [ offline prikhi garbas ];
+    maintainers = with maintainers; [ offline prikhi ];
   };
 }

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     homepage = "https://pep8.readthedocs.org/";
     description = "Python style guide checker";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 
 }

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

@@ -15,7 +15,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A library for converting a token stream into a data structure for use in web form posts";
     homepage = https://docs.pylonsproject.org/projects/peppercorn/en/latest/;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
     platforms = platforms.all;
   };
 

pkgs/development/python-modules/pg8000/1_12.nix

@@ -19,7 +19,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/tlocke/pg8000;
     description = "PostgreSQL interface library, for asyncio";
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
     platforms = platforms.unix;
   };
 

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

@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/tlocke/pg8000;
     description = "PostgreSQL interface library, for asyncio";
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
     platforms = platforms.unix;
   };
 

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

@@ -29,14 +29,15 @@ let
   });
 
   jsonschema3 = callPackage ./jsonschema.nix { };
+  glob2 = callPackage ./glob2.nix { };
 
 in buildPythonPackage rec {
   pname = "poetry";
-  version = "0.12.16";
+  version = "0.12.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h4ldchggsh6gli16p1z25c4jj1in3yyzgqf285zidnjc6rlrqc8";
+    sha256 = "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf";
   };
 
   postPatch = ''
@@ -45,6 +46,8 @@ in buildPythonPackage rec {
       "requests-toolbelt>=0.8.0,<0.10.0"
   '';
 
+  format = "pyproject";
+
   propagatedBuildInputs = [
     cleo6
     requests
@@ -58,7 +61,7 @@ in buildPythonPackage rec {
     html5lib
     shellingham
     tomlkit
-  ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 ]
+  ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
     ++ lib.optionals isPy27 [ virtualenv functools32 ];
 
   postInstall = ''

pkgs/development/python-modules/poetry/glob2.nix

@@ -0,0 +1,11 @@
+{ buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "glob2";
+  version = "0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1miyz0pjyji4gqrzl04xsxcylk3h2v9fvi7hsg221y11zy3adc7m";
+  };
+}

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

@@ -1,47 +1,53 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
-, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
+, betamax
+, betamax-serializers
+, betamax-matchers
+, mock
+, six
+, pytestrunner
+, prawcore
+, pytest
+, requests-toolbelt
+, update_checker
+, websocket_client
 }:
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "6.0.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
     rev = "v${version}";
-    sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
+    sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
   };
 
-  postPatch = ''
-    # drop upper bound of prawcore requirement
-    sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py
-  '';
+  nativeBuildInputs = [
+    pytestrunner
+  ];
 
   propagatedBuildInputs = [
-    requests
-    decorator
-    flake8
     mock
-    six
-    update_checker
-    pytestrunner
     prawcore
+    update_checker
+    websocket_client
   ];
 
   checkInputs = [
-    pytest_3
     betamax
     betamax-serializers
     betamax-matchers
-    requests_toolbelt
+    mock
+    pytest
+    requests-toolbelt
+    six
   ];
 
   meta = with stdenv.lib; {
     description = "Python Reddit API wrapper";
-    homepage = https://praw.readthedocs.org/;
-    license = licenses.gpl3;
+    homepage = "https://praw.readthedocs.org/";
+    license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ ];
   };

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

@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Extensible i3status wrapper";
     license = licenses.bsd3;
     homepage = https://github.com/ultrabug/py3status;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -13,6 +13,6 @@ buildPythonPackage rec {
     description = "Python style guide checker (formerly called pep8)";
     homepage = https://pycodestyle.readthedocs.io;
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -15,6 +15,6 @@ buildPythonPackage rec {
     homepage = https://launchpad.net/pyflakes;
     description = "A simple program which checks Python source files for errors";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -20,6 +20,6 @@ buildPythonPackage rec {
     homepage = "https://launchpad.net/pygpgme";
     description = "A Python wrapper for the GPGME library";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Python client for Neovim";
     homepage = "https://github.com/neovim/python-client";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ garbas ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

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

@@ -40,7 +40,7 @@ buildPythonPackage rec {
     description = "The Pyramid Web Framework, a Pylons project";
     homepage = https://trypyramid.com/;
     license = licenses.bsd0;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     description = "A package which logs to a Python logger when an exception is raised by a Pyramid application";
     homepage = http://docs.pylonsproject.org/;
     license = licenses.bsd0;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pytest-mock";
@@ -12,6 +12,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = lib.optional (!isPy3k) mock;
   nativeBuildInputs = [ setuptools_scm pytest ];
 
+  patches = [
+    # Fix tests for pytest 4.6. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/pytest-dev/pytest-mock/commit/189cc599d3bfbe91a17c93211c04237b6c5849b1.patch";
+      sha256 = "13nk75ldab3j8nfzyd9w4cgfk2fxq4if1aqkqy82ar7y7qh07a7m";
+    })
+  ];
+
   checkPhase = ''
     py.test
   '';

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
     description = "A tiny LRU cache implementation and decorator";
     homepage = http://www.repoze.org/;
     license = licenses.bsd0;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, future, spglib, glibcLocales }:
+{ stdenv, buildPythonPackage, fetchPypi, numpy, future, spglib, glibcLocales, pytest }:
 
 buildPythonPackage rec {
   pname = "seekpath";
@@ -7,7 +7,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     sha256 = "b61dadba82acc0838402981b7944155adc092b114ca81f53f61b1d498a512e3a";
-  };  
+  };
 
   LC_ALL = "en_US.utf-8";
 
@@ -15,9 +15,16 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ glibcLocales ];
 
+  checkInputs = [ pytest ];
+
+  # I don't know enough about crystal structures to fix
+  checkPhase = ''
+    pytest . -k 'not oI2Y'
+  '';
+
   meta = with stdenv.lib; {
     description = "A module to obtain and visualize band paths in the Brillouin zone of crystal structures.";
-    homepage = https://github.com/giovannipizzi/seekpath;
+    homepage = "https://github.com/giovannipizzi/seekpath";
     license = licenses.mit;
     maintainers = with maintainers; [ psyanticy ];
   };

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     description = "Python with the SmartyPants";
     homepage = "https://bitbucket.org/livibetter/smartypants.py";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 
 }

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

@@ -1,33 +1,48 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, pytest
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy
+, dnspython
+, geoip2
+, ipython
 , praw
-, xmltodict
-, pytz
 , pyenchant
 , pygeoip
+, pytest
 , python
-, isPyPy
-, isPy27
+, pytz
+, xmltodict
 }:
 
 buildPythonPackage rec {
   pname = "sopel";
-  version = "6.6.8";
+  version = "6.6.9";
+  disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c32aa69ba8a9ae55daf6dbc265d7f56fe6026edef3bb81aeea7912b7b6b9f5b7";
+    sha256 = "1arldn3p2yp09wnn2cw50r5ri303d5jdsjnf6lgfl82jhfmk49a2";
   };
 
-  buildInputs = [ pytest ];
-  propagatedBuildInputs = [ praw xmltodict pytz pyenchant pygeoip ];
+  propagatedBuildInputs = [
+    dnspython
+    geoip2
+    ipython
+    praw
+    pyenchant
+    pygeoip
+    pytz
+    xmltodict
+  ];
 
-  disabled = isPyPy || isPy27;
+  # remove once https://github.com/sopel-irc/sopel/pull/1653 lands
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "praw<6.0.0" "praw<7.0.0"
+  '';
+
+  checkInputs = [ pytest ];
 
   checkPhase = ''
-    ${python.interpreter} test/*.py                                         #*/
+    HOME=$PWD # otherwise tries to create tmpdirs at root
+    pytest .
   '';
 
   meta = with stdenv.lib; {
@@ -36,5 +51,4 @@ buildPythonPackage rec {
     license = licenses.efl20;
     maintainers = with maintainers; [ mog ];
   };
-
 }

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

@@ -0,0 +1,29 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, ruamel_yaml
+, python-dateutil
+}:
+
+buildPythonPackage rec {
+  version = "1.0.1";
+  pname = "strictyaml";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1baz5zjl1z9dwaczaga1ik1iy1v9zg3acwnpmgghwnk9hw2i1mq6";
+  };
+
+  propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
+
+  # Library tested with external tool
+  # https://hitchdev.com/approach/contributing-to-hitch-libraries/
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Strict, typed YAML parser";
+    homepage = https://hitchdev.com/strictyaml/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

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

@@ -32,6 +32,6 @@ buildPythonPackage rec {
   meta = {
     homepage = https://pypi.python.org/pypi/subprocess32;
     description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x";
-    maintainers = with lib.maintainers; [ garbas ];
+    maintainers = with lib.maintainers; [ ];
   };
-}
+}

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

@@ -1,4 +1,14 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, spglib, pymatgen, h5py, matplotlib, seekpath, phonopy }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+, h5py
+, matplotlib
+, numpy
+, phonopy
+, pymatgen
+, pytest
+, scipy
+, seekpath
+, spglib
+}:
 
 buildPythonPackage rec {
   pname = "sumo";
@@ -13,12 +23,20 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ];
-  
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest .
+  '';
+
+  # tests have type annotations, can only run on 3.5+
+  doCheck = (!isPy27);
+
   meta = with stdenv.lib; {
     description = "Toolkit for plotting and analysis of ab initio solid-state calculation data";
-    homepage = https://github.com/SMTG-UCL/sumo;
+    homepage = "https://github.com/SMTG-UCL/sumo";
     license = licenses.mit;
     maintainers = with maintainers; [ psyanticy ];
   };
 }
-

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

@@ -21,7 +21,7 @@ buildPythonPackage rec {
     homepage = https://github.com/WoLpH/tissue;
     description = "Tissue - automated pep8 checker for nose";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
     homepage = http://pylonsproject.org/;
     description = "Utility library for i18n relied on by various Repoze and Pyramid packages";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Port of the asyncio project to Python 2.7";
     homepage = https://github.com/vstinner/trollius;
     license = licenses.asl20;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -16,6 +16,6 @@ buildPythonPackage rec {
     homepage = https://github.com/tweepy/tweepy;
     description = "Twitter library for python";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 }

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

@@ -26,7 +26,7 @@ buildPythonPackage rec {
     description = "Filters to enhance web typography, including support for Django & Jinja templates";
     homepage = "https://github.com/mintchaos/typogrify";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 
 }

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

@@ -32,6 +32,6 @@ buildPythonPackage (rec {
     homepage = http://excess.org/urwid;
     repositories.git = git://github.com/wardi/urwid.git;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
   };
 })

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

@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "A library for deferring decorator actions";
     homepage = http://pylonsproject.org/;
     license = licenses.bsd0;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 }

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

@@ -18,7 +18,7 @@ buildPythonPackage rec {
      homepage = https://github.com/Pylons/waitress;
      description = "Waitress WSGI server";
      license = licenses.zpl20;
-     maintainers = with maintainers; [ garbas domenkozar ];
+     maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -25,7 +25,7 @@ buildPythonPackage rec {
     homepage = https://webhelpers.readthedocs.org/en/latest/;
     description = "Web Helpers";
     license = licenses.free;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, six
+, backports_ssl_match_hostname
+}:
+
+buildPythonPackage rec {
+  version = "0.56.0";
+  pname = "websocket_client";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ] ++ lib.optional isPy27 backports_ssl_match_hostname;
+
+  meta = with lib; {
+    description = "Websocket client for python";
+    homepage = "https://github.com/websocket-client/websocket-client";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+}

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

@@ -1,24 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
-buildPythonPackage rec {
-  pname = "websocket_client";
-  version = "0.54.0";
-
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849";
-  };
-
-  prePatch = ''
-    # ssl.match_hostname exists in python2.7 version maintained in nixpkgs,
-    # the dependency is not necessary.
-    sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py
-  '';
-
-  propagatedBuildInputs = [ six ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/liris/websocket-client;
-    description = "Websocket client for python";
-    license = licenses.lgpl2;
-  };
-}

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

@@ -24,7 +24,7 @@ buildPythonPackage rec {
     homepage = http://pythonpaste.org/wsgiproxy/;
     description = "HTTP proxying tools for WSGI apps";
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
     homepage = https://github.com/zopefoundation/zope.deprecation;
     description = "Zope Deprecation Infrastructure";
     license = licenses.zpl20;
-    maintainers = with maintainers; [ garbas domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 
 }