From eacb6f8e44b1ace3ad3eb3ec4920b3e8a518b98e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Oct 2021 02:55:08 +0200 Subject: [PATCH 1/5] python3Packages.crownstone-cloud: 1.4.5 -> 1.4.8 --- .../python-modules/crownstone-cloud/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 94e6219264c0..882f7d95df57 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "crownstone-cloud"; - version = "1.4.5"; + version = "1.4.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crownstone"; repo = "crownstone-lib-python-cloud"; - rev = "v${version}"; - sha256 = "1a8bkqkrc7iyggr5rr20qdqg67sycdx2d94dd1ylkmr7627r34ys"; + rev = version; + sha256 = "sha256-iHn4g52/QM0TS/flKkcFrX6IFrCjiXUxcjVLHNg6tVo="; }; propagatedBuildInputs = [ @@ -32,9 +32,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/crownstone/crownstone-lib-python-cloud/issues/1 + "test_data_structure" + ]; + postPatch = '' - substituteInPlace requirements.txt \ - --replace "codecov>=2.1.10" "" + sed -i '/codecov/d' requirements.txt ''; pythonImportsCheck = [ From bde5776146d8bf90f7c50549f0e36774fa580c8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Oct 2021 03:01:50 +0200 Subject: [PATCH 2/5] python3Packages.simplisafe-python: 11.0.6 -> 12.0.2 --- .../python-modules/simplisafe-python/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 09f7a3056fbd..e61063a6a471 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -1,22 +1,24 @@ { lib , aiohttp -, aioresponses +, aresponses , asynctest , backoff , buildPythonPackage , fetchFromGitHub , poetry-core , pytest-aiohttp +, pytest-asyncio , pytestCheckHook , pythonOlder , pytz , types-pytz , voluptuous +, websockets }: buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.6"; + version = "12.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-XVn/GBcTTthvsRJOnCZ0yOF3nUwbBZ2dfMJZsJXnE6U="; + sha256 = "sha256-/KnDsnx+Jrirj6uBkdao6PI2jhtzKqDK6cmmQgsO5T4="; }; nativeBuildInputs = [ poetry-core ]; @@ -35,12 +37,14 @@ buildPythonPackage rec { pytz types-pytz voluptuous + websockets ]; checkInputs = [ - aioresponses + aresponses asynctest pytest-aiohttp + pytest-asyncio pytestCheckHook ]; From 18a3921f0e4d55305d91fa95e1f33d7fe936674f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Oct 2021 12:11:39 +0200 Subject: [PATCH 3/5] python3Packages.pytile: 5.2.3 -> 5.2.4 --- pkgs/development/python-modules/pytile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 779703723eeb..93197e1c2bad 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.2.3"; + version = "5.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "01gxq6dbqjmsqndjcbqv79wd2wgs7krm0rn47k883gh2xg9sn606"; + sha256 = "sha256-9FbcGhRmXULJgfJOmy6mhiZwQUDNmvxZI/WxjJIbnc8="; }; nativeBuildInputs = [ From 521b3ca398f7e4510d1c57ebe4d35c89b3cde0e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Oct 2021 12:35:41 +0200 Subject: [PATCH 4/5] home-assistant: 2021.10.4 -> 2021.10.6 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5b00199373e6..56e30167ad35 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.10.4"; + version = "2021.10.6"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -151,7 +151,7 @@ "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy "cpuspeed" = ps: with ps; [ py-cpuinfo ]; - "crownstone" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; # missing inputs: crownstone-cloud crownstone-sse crownstone-uart + "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud crownstone-sse crownstone-uart pyserial pyudev ]; "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; "daikin" = ps: with ps; [ pydaikin ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 49cb6670de20..a693fc377d23 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.10.4"; + hassVersion = "2021.10.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1cl0h15285x7xba425d9anv882adi6bdqx4i3cicg3gf0nzcc8am"; + sha256 = "0275f327dzr4cggfw5n8x533b4h8zz8yli5d0js7cw1rmi3cmkbc"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 11dabf448604bf2468b272e41650fd5a8987b850 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 Oct 2021 12:35:53 +0200 Subject: [PATCH 5/5] home-assistant: pin simplisafe-python at 11.0.7 --- pkgs/servers/home-assistant/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a693fc377d23..ef1ce97ae74c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -68,6 +68,20 @@ let # Pinned due to API changes in 0.1.0 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + # Pinned due to missing simpliypy.errors.PendingAuthorizationError in simplisafe-python>12 which results in a failing import + (self: super: { + simplisafe-python = super.simplisafe-python.overridePythonAttrs (oldAttrs: rec { + version = "11.0.7"; + src = fetchFromGitHub { + owner = "bachya"; + repo = "simplisafe-python"; + rev = version; + sha256 = "02nrighkdcd5n9qgbizm9gyfnpgdm4iibw7y8nbyfaxpng069fzp"; + }; + checkInputs = oldAttrs.checkInputs ++ [ super.aioresponses ]; + }); + }) + # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment (self: super: { total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec {