Merge branch 'master' into staging

Hydra: ?compare=1430035

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "colorlog";
+  version = "3.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0i21sd6pggr2gqza41vyq2rqyb552wf5iwl4bc16i7kqislbd53z";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test -p no:logging
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Log formatting with colors";
+    homepage = https://github.com/borntyping/python-colorlog;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -1,5 +1,5 @@
 { lib
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , pythonOlder
 , withVoice ? true, libopus
@@ -9,14 +9,12 @@
 , pynacl
 }:
 
-let
+buildPythonPackage rec {
   pname = "discord.py";
   version = "0.16.12";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108";
   };
 
@@ -38,5 +36,9 @@ in buildPythonPackage rec {
     description = "A python wrapper for the Discord API";
     homepage    = "https://discordpy.rtfd.org/";
     license     = lib.licenses.mit;
+
+    # discord.py requires websockets<4.0
+    # See https://github.com/Rapptz/discord.py/issues/973
+    broken = true;
   };
 }

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

@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, transitions, websockets, passlib, docopt, pyyaml, nose }:
+
+buildPythonPackage rec {
+  pname = "hbmqtt";
+  version = "0.9.1";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx";
+  };
+
+  propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests -e test_connect_tcp
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/beerfactory/hbmqtt;
+    description = "MQTT client/broker using Python asynchronous I/O";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -6,15 +6,13 @@
 , isPy3k
 }:
 
-let
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "multidict";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y0pg3r9hlknny0zwg906wz81h8in6lgvnpbmzvl911bmnrqc95p";
+    sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v";
   };
 
   buildInputs = [ cython ];
@@ -22,9 +20,10 @@ in buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  meta = {
+  meta = with lib; {
     description = "Multidict implementation";
     homepage = https://github.com/aio-libs/multidict/;
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
   };
 }

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

@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, pyparsing }:
+
+buildPythonPackage rec {
+  pname = "PuLP";
+  version = "1.6.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g";
+  };
+
+  buildInputs = [];
+  propagatedBuildInputs = [ pyparsing ];
+
+  # only one test that requires an extra
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/coin-or/pulp;
+    description = "PuLP is an LP modeler written in python";
+    maintainers = with maintainers; [ teto ];
+    license = licenses.mit;
+  };
+}

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

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "pyhomematic";
+  version = "0.1.38";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15b09ppn5sn3vpnwfb7gygrvn5v65k3zvahkfx2kqpk1xah0mqbf";
+  };
+
+  # Tests reuire network access
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python 3 Interface to interact with Homematic devices";
+    homepage = https://github.com/danielperna84/pyhomematic;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "supervise_api";
-  version = "0.2.0";
+  version = "0.3.0";
 
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b";
+    sha256 = "13gy2m14zh6lbdm45b40ffjnw8y3dapz9hvzpwk8vyvbxj4f1vaf";
   };
 
   propagatedBuildInputs = [

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

@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, six, nose, mock, dill, pycodestyle }:
+
+buildPythonPackage rec {
+  pname = "transitions";
+  version = "0.6.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ikxsjg7vil0yhiwhiimnjzcb1ig6g6g79sdhs9v8rnrszk1mi2n";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "dill<0.2.7" dill
+  '';
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ nose mock dill pycodestyle ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pytransitions/transitions;
+    description = "A lightweight, object-oriented finite state machine implementation in Python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}