Merge master into staging-next

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

@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, python-dateutil
+, python-slugify
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "blinkpy";
+  version = "0.17.1";
+
+  src = fetchFromGitHub {
+    owner = "fronzbot";
+    repo = "blinkpy";
+    rev = "v${version}";
+    sha256 = "11h4r2vkrlxwjig1lay1n5wpny5isfgz85f7lsn8ndnqa2wpsymp";
+  };
+
+  propagatedBuildInputs = [
+    python-dateutil
+    python-slugify
+    requests
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "blinkpy"
+    "blinkpy.api"
+    "blinkpy.auth"
+    "blinkpy.blinkpy"
+    "blinkpy.camera"
+    "blinkpy.helpers.util"
+    "blinkpy.sync_module"
+  ];
+
+  meta = with lib; {
+    description = "Python library for the Blink Camera system";
+    homepage = "https://github.com/fronzbot/blinkpy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

pkgs/development/python-modules/garminconnect-ha/default.nix

@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "garminconnect-ha";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "cyberjunky";
+    repo = "python-garminconnect-ha";
+    rev = version;
+    sha256 = "0ngas6zikhpja1cdkq64m9pjm4b0z3qaj9g3x88mggy60jsxm1d7";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "garminconnect_ha" ];
+
+  meta = with lib; {
+    description = "Minimal Garmin Connect Python 3 API wrapper for Home Assistant";
+    homepage = "https://github.com/cyberjunky/python-garminconnect-ha";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}

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

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "0.13.4";
+  version = "0.13.6";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "0vfdkd3bq14mnjd2gfg3ajsgygmd796md7pv96nicpx20prw3a2p";
+    sha256 = "sha256-7G7jchOQTgcFSGZfoMPFm0NY9ofg5MM5Xn5lV+W9w8k=";
   };
 
   propagatedBuildInputs = [

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pydaikin";
-  version = "2.4.1";
+  version = "2.4.2";
   disabled = pythonOlder "3.6";
 
   src = fetchFromBitbucket {
     owner = "mustang51";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1624adp4lqd1n9flnf0wqrcibml2nd19ga3fmxzjg4x5z6767bs3";
+    sha256 = "13cslszjhd1x7j0ja0n0wpy62hb2sdmkrmjl3qhwqfggps2w2wy1";
   };
 
   propagatedBuildInputs = [
@@ -28,6 +28,10 @@ buildPythonPackage rec {
     urllib3
   ];
 
+  # while they have tests, they do not run them in their CI and they fail as of 2.4.2
+  # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
+  doCheck = false;
+
   checkInputs = [
     freezegun
     pytest-aiohttp

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

@@ -7,7 +7,6 @@
 , cloudpickle
 , msgpack
 , isPy27
-, selectors34
 , pytestCheckHook
 }:
 
@@ -15,6 +14,8 @@ buildPythonPackage rec {
   pname = "Pyro4";
   version = "4.80";
 
+  disabled = isPy27;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     serpent
-  ] ++ lib.optionals isPy27 [ selectors34 ];
+  ];
 
   buildInputs = [
     dill

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

@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, python
-, six
-}:
-
-buildPythonPackage rec {
-  pname = "selectors34";
-  version = "1.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c";
-  };
-
-  propagatedBuildInputs = [ six ];
-
-  checkPhase = ''
-    ${python.interpreter} setup.py test
-  '';
-
-  meta = with lib; {
-    description = "A backport of the selectors module from Python 3.4";
-    homepage = "https://github.com/berkerpeksag/selectors34";
-    license = licenses.psfl;
-    maintainers = with maintainers; [ prusnak ];
-    };
-}