Merge staging-next into staging

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

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+# propagatedBuildInputs
+, aiohttp
+# buildInputs
+, pytest
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "aresponses";
+  version = "1.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d1d6ef52b9a97142d106688cf9b112602ef3dc66f6368de8f91f47241d8cfc9c";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  buildInputs = [
+    pytest
+    pytest-asyncio
+  ];
+
+  # tests only distributed via git repository, not pypi
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Asyncio testing server";
+    homepage = "https://github.com/circleup/aresponses";
+    license = licenses.mit;
+    maintainers = [ maintainers.makefu ];
+  };
+}

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "autograd";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zd4lhz9dpll4i63jjijbzkzbgmg8h88il7lr7kmcylvadnzm2x0";
+    sha256 = "1i1ylf03b7220n8znk63zg6sgdd3py9wlh1pvqvy03g1fxsi8pd1";
   };
 
   propagatedBuildInputs = [ numpy future ];

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

@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-web";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn";
+    sha256 = "0yqxk2zr1ibm2vycyq4vy9hy0xhznma5x3kjl6qxhmb4kyyyljkh";
   };
 
   propagatedBuildInputs = [

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

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "babelfish";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
     sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104";
   };
 
+  propagatedBuildInputs = [ setuptools ];
+
   meta = with stdenv.lib; {
     homepage = https://pypi.python.org/pypi/babelfish;
     description = "A module to work with countries and languages";

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

@@ -8,6 +8,7 @@
 , mock
 , numpy
 , nodejs
+, packaging
 , pillow
 , pytest
 , python
@@ -48,6 +49,7 @@ buildPythonPackage rec {
     pyyaml
     tornado
     numpy
+    packaging
   ]
   ++ lib.optionals ( !isPy3k ) [ futures ];
 

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

@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
 
 buildPythonPackage rec {
-  version = "1.0.1";
+  version = "1.2.0";
   pname = "confluent-kafka";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04bsnyhldcvscdj0dg3hm5k27vmhfi9k6bwz963sd3q2h7g9k6kg";
+    sha256 = "1nn8z7ggjj04v97jm33dxh2cv2azy4xi1hwkj9qwbbc68vasc3cp";
   };
 
   buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "credstash";
-  version = "1.15.0";
+  version = "1.16.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb";
+    sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435";
   };
 
   # The install phase puts an executable and a copy of the library it imports in

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cx_Freeze";
-  version = "5.1.1";
+  version = "6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2eadddde670f5c5f6cf88638a0ac4e5d5fe181292a31063275fa56c7bf22426b";
+    sha256 = "067bgkgx7i3kw31vaviwysbb1lk91cjw9q90vklsr7nsygjxi0fa";
   };
 
   propagatedBuildInputs = [ ncurses ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ed25519";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+    sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182";
   };
 
   meta = with stdenv.lib; {

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

@@ -1,17 +1,14 @@
-{ buildPythonPackage
-, lib
-, fetchFromGitHub
-}:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
-  version = "1.1.8";
+  version = "1.3.0";
   pname = "elementpath";
 
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "0krczvf8r6pb3hb8qaxl9h2b4qwg180xk66gyxjf002im7ri75aj";
+    sha256 = "0ahqqqpcf3fd6xcdhiwwscincyj6h5xyjaacnqxwph1y1b8mnzyw";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this

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

@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "0.5.1";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     rev = "v${version}";
-    sha256 = "1j665fpkyfib17z0hn3bg2j96pbkgd36yfif6jyia4yn6g76hlfg";
+    sha256 = "0bdgphw43m2nrgcp83j1pnxknnzahm2zmdr55hyz3jjkva7m6dpk";
   };
 
   checkInputs = [ pytest Rtree ];

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

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, isPyPy, lib
+{ buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib
 , psutil, setuptools, bottle, batinfo, pysnmp
 , hddtemp, future
 # Optional dependencies:
@@ -9,18 +9,23 @@
 
 buildPythonPackage rec {
   pname = "glances";
-  version = "3.1.2";
+  version = "3.1.3";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd";
+    sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
-  patches = lib.optional doCheck ./skip-failing-tests.patch;
+  patches = lib.optional doCheck ./skip-failing-tests.patch
+    ++ [ (fetchpatch {
+      # Correct unitest
+      url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch";
+      sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1";
+    }) ];
 
   doCheck = true;
   checkInputs = [ unittest2 ];

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

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k
-, google_api_python_client, simplejson, oauth2client
+, google_api_python_client, simplejson, oauth2client, setuptools
 }:
 
 buildPythonPackage rec {
@@ -12,7 +12,9 @@ buildPythonPackage rec {
     sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg";
   };
 
-  propagatedBuildInputs = [ google_api_python_client simplejson oauth2client ];
+  propagatedBuildInputs = [
+    google_api_python_client simplejson oauth2client setuptools
+  ];
 
   meta = with stdenv.lib; {
     description = "Search your google contacts from the command-line or mutt";

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

@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1skqq36k1dm7mngfg9c93pb1rdvmbapc0cv8zj00hnm63r67hmrj";
+    sha256 = "1x18yqxa6a884j0ip92kgl5s8c77z6f4pvnq6q4lzisyffkyq6c7";
   };
 
   propagatedBuildInputs = [ future requests python-dateutil ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ijson";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "135rwh7izzmj4lwkrfb9xw4ik0gcwjz34ygnmx3vyvki2xbbp2xp";
+    sha256 = "08ppzz4my7dbs5bsdv3r1yn8bx8ijqmk5hjfdblrzrxhj184v4bs";
   };
 
   doCheck = false; # something about yajl

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

@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A CFFI binding for Hoedown, a markdown parsing library";
-    homepage = "http://misaka.61924.nl/";
+    homepage = "https://misaka.61924.nl";
     license = licenses.mit;
     maintainers = with maintainers; [ fgaz ];
   };

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

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname   = "pathspec";
-  version = "0.5.9";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54a5eab895d89f342b52ba2bffe70930ef9f8d96e398cccf530d21fa0516a873";
+    sha256 = "0p7ab7jx3wgg7xdj2q8yk99cz3xv2a5p1r8q9kfylnvqn34cr1g2";
   };
 
   meta = {

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

@@ -87,6 +87,5 @@ in buildPythonPackage rec {
     description = "Python dependency management and packaging made easy";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];
-    broken = true;
   };
 }

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

@@ -9,12 +9,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.7";
+  version = "1.2.0";
   pname = "pyannotate";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54e6035a8601248992e17734034e6555842c6ea9863f90c15d14fe76a184be07";
+    sha256 = "16bm0mf7wxvy0lgmcs1p8n1ji8pnvj1jvj8zk3am70dkp825iv84";
   };
 
   checkInputs = [ pytest ];

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

@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+# propagatedBuildInputs
+, aiohttp
+, async-timeout
+# buildInputs
+, pytestrunner
+# checkInputs
+, pytest
+, pytest-asyncio
+, aresponses
+}:
+buildPythonPackage rec {
+  pname = "pyhaversion";
+  version = "3.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d4smpzlaw0sqfgkgvhxsn8h7bmwj8h9gj98sdzvkzhp5vhd96b2";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  buildInputs = [
+    pytestrunner
+  ];
+
+  checkInputs = [
+    pytest
+    pytest-asyncio
+    aresponses
+  ];
+
+  meta = with lib; {
+    description = "A python module to the newest version number of Home Assistant";
+    homepage = https://github.com/ludeeus/pyhaversion;
+    maintainers = [ maintainers.makefu ];
+  };
+}

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

@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}:
+
+ buildPythonPackage rec {
+  pname = "solo-python";
+  version = "0.0.15";
+  format = "flit";
+
+  src = fetchFromGitHub {
+    owner = "solokeys";
+    repo = pname;
+    rev = version;
+    sha256 = "14na9s65hxzx141bdv0j7rx1wi3cv85jzpdivsq1rwp6hdhiazr1";
+  };
+
+  # TODO: remove ASAP
+  patchPhase = ''
+    substituteInPlace pyproject.toml --replace "fido2 == 0.7.0" "fido2 >= 0.7.0"
+  '';
+
+  propagatedBuildInputs = [
+    click
+    ecdsa
+    fido2
+    intelhex
+    pyserial
+    pyusb
+    requests
+  ];
+
+  meta = with lib; {
+    description = "Python tool and library for SoloKeys";
+    homepage = "https://github.com/solokeys/solo-python";
+    maintainers = with maintainers; [ wucke13 ];
+    license = with licenses; [ asl20 mit ];
+  };
+}

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

@@ -1,6 +1,8 @@
 { stdenv, lib, fetchPypi, python, buildPythonPackage
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
 
+with stdenv.lib;
+
 buildPythonPackage rec {
   version = "3.5.2";
   pname = "tables";
@@ -15,13 +17,12 @@ buildPythonPackage rec {
 
   # The setup script complains about missing run-paths, but they are
   # actually set.
-  setupPyBuildFlags =
-    [ "--hdf5=${lib.getDev hdf5}"
-      "--lzo=${lzo}"
-      "--bzip2=${bzip2.dev}"
-      "--blosc=${c-blosc}"
-    ];
-
+  setupPyBuildFlags = [
+    "--hdf5=${getDev hdf5}"
+    "--lzo=${getDev lzo}"
+    "--bzip2=${getDev bzip2}"
+    "--blosc=${getDev c-blosc}"
+  ];
   # Run the test suite.
   # It requires the build path to be in the python search path.
   # These tests take quite some time.

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

@@ -4,14 +4,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.13";
+  version = "1.0.15";
   pname = "xmlschema";
 
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "v${version}";
-    sha256 = "182439gqhlxhr9rdi9ak33z4ffy1w9syhykkckkl6mq050c80qdr";
+    sha256 = "1s8ggvy2s7513cxcal3r37rn1bhpkxhq3hs5m9pgvmrysxjdz8lb";
   };
 
   propagatedBuildInputs = [ elementpath ];
@@ -25,6 +25,7 @@ buildPythonPackage rec {
       --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #"
     pytest . \
       --ignore=xmlschema/tests/test_factory.py \
+      --ignore=xmlschema/tests/test_memory.py \
       --ignore=xmlschema/tests/test_validators.py \
       --ignore=xmlschema/tests/test_schemas.py \
       -k 'not element_tree_import_script'

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

@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.3.0";
+  version = "1.4.1";
   pname = "xxhash";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rhrqrlq4n3vgqd1fv1dcc5ga5dzy9qbd40p8rsqqhh5klxg48gy";
+    sha256 = "1wgx83lpf8rq95784afj5y9jfcrs1mf6k3pjfyp4a9zigz1zhnkb";
   };
 
   meta = with stdenv.lib; {