Merge master into staging-next

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

@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "brotli";
-  version = "1.0.5";
+  version = "1.0.7";
 
   # PyPI doesn't contain tests so let's use GitHub
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja";
+    sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
   };
 
   checkInputs = [ pytest ];

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

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.0.1";
+  version = "1.0.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20556931f546838d09be5d589482dfae6164e0d403f0aab2163c006b680d3b92";
+    sha256 = "1fxpvy3z0b3ga8ylr54ml7nxsfah2bh5azk43nb565rcka3x909c";
   };
 
   checkInputs = [ pytest coveralls pytestcov ];

pkgs/development/python-modules/click-repl/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }:
+
+buildPythonPackage rec {
+  pname = "click-repl";
+  version = "0.1.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mcmz95595nrp4r58spy1ac993db26hk4q97isghbmn4md99vwmr";
+  };
+
+  propagatedBuildInputs = [ click prompt_toolkit ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/click-contrib/click-repl;
+    description = "Subcommand REPL for click apps";
+    license = licenses.mit;
+    maintainers = with maintainers; [ twey ];
+  };
+}

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

@@ -6,12 +6,12 @@
 , enum34, functools32,
 }:
 buildPythonApplication rec {
-  version = "1.22.0";
+  version = "1.23.1";
   pname = "docker-compose";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "915cdd0ea7aff349d27a8e0585124ac38695635201770a35612837b25e234677";
+    sha256 = "15jijx3md70b9xw8818xjm70nr9pc27p7v7is0yi6agf8scvvqkq";
   };
 
   # lots of networking and other fails

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.0.9";
+  version = "3.0.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97694f181bdf58f213cca0a7cb556dc7bf90e2f8eb9aa3151260adac56701afb";
+    sha256 = "1rjv7g85smh6hrq6n9h721kh83qjv8mfp0ksdnbqbbsd82xw246n";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/gin-config/default.nix

@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, enum34
+}:
+
+buildPythonPackage rec {
+  pname = "gin-config";
+  version = "0.1.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zqzhg8nqdqjx0sjrsrs9bpyiaqqlyihqhhy2ijrpp62x9rjllga";
+
+  };
+
+  propagatedBuildInputs = [ six enum34 ];
+
+  # PyPI archive does not ship with tests
+  doCheck= false;
+
+  meta = with lib; {
+    homepage = https://github.com/google/gin-config;
+    description = "Gin provides a lightweight configuration framework for Python, based on dependency injection.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jethro ];
+  };
+}

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

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5db2d69315b3d95d067c9bffe17994b6ee9252702888cc300d76252b451638e1";
+    sha256 = "1jjicvf5r20ibhkkay0p6av8jifvp2wkdd8bs9vmhm4rwvcnlxbf";
   };
 
   propagatedBuildInputs = [ google_api_core ];

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

@@ -1,36 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, docutils
-, lxml
-, manuel
-, pygments
-, svg-path
-, watchdog
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  pname = "hovercraft";
-  version = "2.0";
-  disabled = ! isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
-  };
-
-  propagatedBuildInputs = [ docutils lxml manuel pygments svg-path watchdog ];
-
-  # one test assumes we have docutils 0.12
-  # TODO: enable tests after upgrading docutils to 0.12
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "A tool to make impress.js presentations from reStructuredText";
-    homepage = https://github.com/regebro/hovercraft;
-    license = licenses.mit;
-    maintainers = with maintainers; [ goibhniu ];
-  };
-
-}

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

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "0.28.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16id8jppw8r54wisrlaaiprcszzb7d7lbpnskqn38s8i7vnkf4b5";
+    sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q";
   };
 
   buildInputs = [

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

@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "patsy";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fw888zd2s7f5zxm9f98ss93qhwv0sqnbdy21ipj33ccqgakhpz0";
+    sha256 = "149rbrdzwns0ay88caf1zsm1r53v1q5np1mrb36na50y432cw5gi";
   };
 
   checkInputs = [ nose parameterized ];

pkgs/development/python-modules/prompt_toolkit/1.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, docopt
+, six
+, wcwidth
+, pygments
+}:
+
+buildPythonPackage rec {
+  pname = "prompt_toolkit";
+  version = "1.0.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917";
+  };
+  checkPhase = ''
+    rm prompt_toolkit/win32_types.py
+    py.test -k 'not test_pathcompleter_can_expanduser'
+  '';
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ docopt six wcwidth pygments ];
+
+  meta = {
+    description = "Python library for building powerful interactive command lines";
+    longDescription = ''
+      prompt_toolkit could be a replacement for readline, but it can be
+      much more than that. It is cross-platform, everything that you build
+      with it should run fine on both Unix and Windows systems. Also ships
+      with a nice interactive Python shell (called ptpython) built on top.
+    '';
+    homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
+    license = lib.licenses.bsd3;
+  };
+}

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

@@ -2,27 +2,24 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
-, docopt
 , six
 , wcwidth
-, pygments
 }:
 
 buildPythonPackage rec {
   pname = "prompt_toolkit";
-  version = "1.0.15";
+  version = "2.0.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917";
+    sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx";
   };
   checkPhase = ''
-    rm prompt_toolkit/win32_types.py
     py.test -k 'not test_pathcompleter_can_expanduser'
   '';
 
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ docopt six wcwidth pygments ];
+  propagatedBuildInputs = [ six wcwidth ];
 
   meta = {
     description = "Python library for building powerful interactive command lines";
@@ -35,4 +32,4 @@ buildPythonPackage rec {
     homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
     license = lib.licenses.bsd3;
   };
-}
+}

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

@@ -1,17 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, wcwidth, six, prompt_toolkit, docopt
-, jedi, pygments }:
+{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }:
 
 buildPythonPackage rec {
   pname = "ptpython";
-  version = "0.41";
-  name  = "${pname}-${version}";
+  version = "2.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hcaaadkp5n37hxggraynifa33wx1akklzvf6y4rvgjxbjl2g2x7";
+    sha256 = "1m34jbwj3j3762mg1vynpgciqw4kqdzdqjvd62mwhbjkly7ddsgb";
   };
 
-  propagatedBuildInputs = [ wcwidth six prompt_toolkit docopt jedi pygments ];
+  propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ];
 
   # no tests to run
   doCheck = false;

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

@@ -23,11 +23,11 @@ in
 
 buildPythonPackage rec {
   pname = "selenium";
-  version = "3.14.1";
+  version = "3.141.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614";
+    sha256 = "039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy";
   };
 
   buildInputs = [xorg.libX11];

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

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "texttable";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b";
+    sha256 = "0mzv6zs8ciwnf83fwikqmmjwbzqmdja3imn4b4k209f80g0rk8qv";
   };
 
   meta = {