Merge staging-next into staging

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

@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "astroquery";
-  version = "0.3.8";
+  version = "0.3.9";
 
   doCheck = false; # Tests require the pytest-astropy package
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "800d9730c9e2bd299f14c29b4d709d1605c82833223a2e4f784fea7ad805c168";
+    sha256 = "0zw3xp2rfc6h2v569iqsyvzhfnzp7bfjb7jrj61is1hrqw1cqjrb";
   };
 
   propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];

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

@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9037d73d7a812c3dc75d9cc27d03215483c9e782eae63a07142c0725c6bd2df0";
+    sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z";
   };
 
   buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];

pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix

@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, blockdiag
+}:
+
+buildPythonPackage rec {
+  pname = "blockdiagcontrib-cisco";
+  version = "0.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2";
+  };
+
+  buildInputs = [ blockdiag ];
+
+  meta = with stdenv.lib; {
+    description = "Noderenderer plugin for blockdiag containing Cisco networking symbols";
+    homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/";
+    maintainers = [ maintainers.bjornfor ];
+    license = licenses.psfl;
+  };
+
+}

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

@@ -33,11 +33,11 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "43aa8b867f2db99c0cf3178149d2533e9e954a8355d6161381d0b8765c90db5e";
+    sha256 = "07rczl2xkkqzpm45m0rlb2hki48b6w1k912gmwacf5aisnc0a0rw";
   };
 
   disabled = isPyPy;

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

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "casttube";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g7mksfl341vfsxqvw8h15ci2qwd1rczg41n4fb2hw7y9rikqnzj";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Interact with the Youtube Chromecast api";
+    homepage = http://github.com/ur1katz/casttube;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}

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/daemonize/default.nix

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "daemonize";
-  version = "2.4.7";
+  version = "2.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8";
+    sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx";
   };
 
   meta = with stdenv.lib; {

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

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

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

@@ -26,12 +26,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "1.24.2";
+  version = "1.25.1";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ab24f0ea634dab7b6667c32b18c98794141f3ef3b081293dfea1943498ce987";
+    sha256 = "1qay94amxs0k6lmwhy07bq54m5zms0rjmnp7a66fldipjla6w8lg";
   };
 
   checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

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

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

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q";
+    sha256 = "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3";
   };
 
   # The pypi package does not include tests

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-API";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dffcy2hdkajbvl2wkz9dam49v05x9d87cf2mh2cyvza2c5ah47w";
+    sha256 = "0r23pdlaz6ibz9vml3m7v6v3firvykbrsi1zzxkdhls0zi9jq560";
   };
 
   propagatedBuildInputs = [ flask markdown ];

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

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "gym";
-  version = "0.9.6";
+  version = "0.10.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0llbhn3zdlsz2crd5grd1yygg8zp2shsclc24iqix5gw5f65clx5";
+    sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0";
   };
 
   propagatedBuildInputs = [

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/kubernetes/default.nix

@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "8.0.0";
+  version = "8.0.1";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54f8e7bb1dd9a55cf416dff76a63c4ae441764280942d9913f2243676f29d02c";
+    sha256 = "0y0aygnd7kpflwdm3zxrmsgws0frk4qwq3lnq92zsiyxcxh8r4i5";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];

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

@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
 
 buildPythonPackage rec {
-  version = "2.5.1";
+  version = "2.5.2";
   pname = "ldap3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cc09951809678cfb693a13a6011dd2d48ada60a52bd80cb4bd7dcc55ee7c02fd";
+    sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
   };
 
   buildInputs = [ gssapi ];

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/pgspecial/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pgspecial";
-  version = "1.11.3";
+  version = "1.11.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f183da55c37128f7a74fe5b28e997991156f19961e59a1ad0f400ffc9535faba";
+    sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
   };
 
   buildInputs = [ pytest psycopg2 ];

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/pychromecast/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
+{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf, casttube }:
 
 buildPythonPackage rec {
   pname = "PyChromecast";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38";
   };
 
-  propagatedBuildInputs = [ requests six zeroconf protobuf ];
+  propagatedBuildInputs = [ requests six zeroconf protobuf casttube ];
 
   meta = with lib; {
     description = "Library for Python 2 and 3 to communicate with the Google Chromecast";

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/pylibmc/default.nix

@@ -1,12 +1,12 @@
 { buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:
 
 buildPythonPackage rec {
-  version = "1.5.2";
+  version = "1.6.0";
   pname = "pylibmc";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
+    sha256 = "1n6nvvhl0g52gpzzwdj1my6049xljkfwyxxygnwda9smrbj7pyay";
   };
 
   buildInputs = [ libmemcached zlib cyrus_sasl ];

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/pymetar/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pymetar";
-  version = "1.0";
+  version = "1.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap";
+    sha256 = "0y42l7mmp7jn4pzg66x3k57c6hqpxc22mgzgaqqpblkx2kzh42n9";
   };
 
   checkPhase = ''

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

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "PyMySQL";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy";
+    sha256 = "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q";
   };
 
   propagatedBuildInputs = [ cryptography ];

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

@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyodbc";
-  version = "4.0.24";
+  version = "4.0.25";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4326abb737dec36156998d52324921673d30f575e1e0998f0c5edd7de20e61d4";
+    sha256 = "1bbwrb812w5i0x56jfn0l86mxc2ck904hl8y87mziay96znwia0f";
   };
 
   buildInputs = [ unixODBC ];

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/pytado/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "PyTado";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "wmalgadey";
+    repo = pname;
+    # Upstream hasn't tagged this release yet. This commit fixes the build.
+    rev = "79a5dfdf75cd9a3e1a1ee8a8ff0d08923aebda7b";
+    sha256 = "14xdfw4913g4j4h576hjbigm7fiw8k0dc8s98gh2ag9xrc2ifgr0";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python binding for Tado web API. Pythonize your central heating!";
+    homepage = https://github.com/wmalgadey/PyTado;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ elseym ];
+  };
+}

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/rasterio/default.nix

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

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;

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

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