Merge master into staging-next

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

@@ -5,15 +5,21 @@
 , backports_functools_lru_cache, requests_toolbelt
 }:
 
-buildPythonPackage rec {
+let
+  srcInfo = if isPy3k then {
+    version = "18.0.1";
+    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+  } else {
+    version = "17.4.1";
+    sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
+  };
+in buildPythonPackage rec {
   pname = "CherryPy";
-  version = "18.0.1";
-
-  disabled = !isPy3k;
+  inherit (srcInfo) version;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+    inherit pname;
+    inherit (srcInfo) version sha256;
   };
 
   propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];

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

@@ -4,6 +4,7 @@
 , Babel
 , pytz
 , nine
+, nose
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ Babel pytz nine ];
+  checkInputs = [ nose ];
 
   meta = with stdenv.lib; {
     description = "Kajiki provides fast well-formed XML templates";

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

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "ofxparse";
-  version = "0.19";
+  version = "0.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
+    sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb";
   };
 
   propagatedBuildInputs = [ six beautifulsoup4 lxml ];

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

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

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

@@ -12,6 +12,7 @@
 , gunicorn
 , jinja2
 , virtualenv
+, mock
 }:
 
 buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
     webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
   ];
 
+  checkInputs = [ mock ];
+
   meta = with stdenv.lib; {
     description = "Pecan";
     homepage = "https://github.com/pecan/pecan";

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

@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchPypi, fetchpatch
 , darwin
 }:
 
@@ -13,6 +13,14 @@ buildPythonPackage rec {
     sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "disk_io_counters_fails.patch";
+      url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff";
+      sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk";
+    })
+  ];
+
   # No tests in archive
   doCheck = false;
 

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

@@ -4,6 +4,9 @@
 , mock
 , matplotlib
 , pkgs
+, nbconvert
+, markdown
+, isPy3k
 }:
 
 buildPythonPackage rec {
@@ -15,8 +18,10 @@ buildPythonPackage rec {
     sha256 = "5e5298d90e06414a01f48e0d6aa4c36a70c5f223d929f2a9c7e2d388451c7357";
   };
 
+  disabled = !isPy3k;
+
   buildInputs = [ mock pkgs.glibcLocales ];
-  propagatedBuildInputs = [ matplotlib ];
+  propagatedBuildInputs = [ matplotlib nbconvert markdown ];
 
   # fails due to trying to run CSS as test
   doCheck = false;

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

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.52";
+  version = "0.1.53";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4947b75401245d3a69de698617bb81fcba1ed7fd56c15d339a5f3b2bbbc391f7";
+    sha256 = "1crqdqbv7yqw2pasydy51ps048phbdn7s37xaba9npd1xm8g7jvh";
   };
 
   # PyPI tarball does not include tests/ directory

pkgs/development/python-modules/pylint/1.9.nix

@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09bc539f85706f2cca720a7ddf28f5c6cf8185708d6cb5bbf7a90a32c3b3b0aa";
+    sha256 = "ee1e85575587c5b58ddafa25e1c1b01691ef172e139fc25585e5d3f02451da93";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];

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

@@ -2,23 +2,23 @@
 , buildPythonPackage
 , fetchPypi
 , pyasn1
-, pycrypto
+, pycryptodomex
 , pysmi
 }:
 
 buildPythonPackage rec {
-  version = "4.4.6";
+  version = "4.4.8";
   pname = "pysnmp";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e34ffa0dce5f69adabd478ff76c3e1b08e32ebb0767df8b178d0704f4a1ac406";
+    sha256 = "1c42qicrh56m49374kxna2s2nmdwna3yqgnz16frzj0dw7vxrrhk";
   };
 
   # NameError: name 'mibBuilder' is not defined
   doCheck = false;
 
-  propagatedBuildInputs = [ pyasn1 pycrypto pysmi ];
+  propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ];
 
   meta = with stdenv.lib; {
     homepage = http://pysnmp.sf.net;
@@ -26,5 +26,4 @@ buildPythonPackage rec {
     license = licenses.bsd2;
     maintainers = with maintainers; [ koral ];
   };
-
 }

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

@@ -3,6 +3,7 @@
 , fetchPypi
 , setuptools_scm
 , pytest
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -14,6 +15,15 @@ buildPythonPackage rec {
     sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3";
   };
 
+  # fixes support for pytest >3.6. Should be droppable during the
+  # next bump.
+  patches = [
+    (fetchpatch {
+      url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch;
+      sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny";
+    })
+  ];
+
   buildInputs = [ setuptools_scm pytest ];
 
   checkPhase = ''

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

@@ -25,11 +25,6 @@ buildPythonPackage rec {
     py.test
   '';
 
-  postPatch = ''
-    # File says it's utf-8 so instead of relying on the environment, fix the decoding when reading.
-    substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
-  '';
-
   propagatedBuildInputs = [ future six ecdsa rsa ];
 
   meta = with stdenv.lib; {

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

@@ -4,6 +4,8 @@
 , unittest2
 , pyasn1
 , mock
+, isPy3k
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -18,6 +20,10 @@ buildPythonPackage rec {
   checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
+  preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
+    substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://stuvel.eu/rsa;
     license = licenses.asl20;