diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2020-08-03 16:59:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-03 16:59:52 +0200 |
commit | df5103333006b02a35caad8e6db898263e8bd72e (patch) | |
tree | bbd5ab8182022031d873f7475e8ea5179dd6f391 /pkgs/servers/home-assistant | |
parent | dd49aa581b5163365ff554f109be46debabc812c (diff) | |
parent | 87d4e1230b458b3a43a18003fa22ad7f98a831df (diff) |
Merge pull request #94475 from mweinelt/hass
homeassistant: 0.113.0 -> 0.113.3
Diffstat (limited to 'pkgs/servers/home-assistant')
-rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch | 33 |
3 files changed, 38 insertions, 4 deletions
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 44087bae18876..850992fdfb1fa 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 = "0.113.0"; + version = "0.113.3"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -664,7 +664,7 @@ "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy - "route53" = ps: with ps; [ boto3]; # missing inputs: ipify + "route53" = ps: with ps; [ boto3]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8c2a394857671..957d61e8ad763 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -72,7 +72,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.113.0"; + hassVersion = "0.113.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -82,6 +82,7 @@ in with py.pkgs; buildPythonApplication rec { patches = [ ./relax-dependencies.patch + ./fix-flapping-chained-task-logging-test.patch ]; inherit availableComponents; @@ -91,7 +92,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1yb943wkiawh5p4mj5089qcsjfnwb91ga666qriz32bzpfgrzrna"; + sha256 = "1lrllhafjawrghdp81lz1ffdqcj2q0x9ndp11nhi8s9fd8bb4c8j"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch b/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch new file mode 100644 index 0000000000000..1549046fc4065 --- /dev/null +++ b/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch @@ -0,0 +1,33 @@ +From 1d54dafad9968465d995d195f683d8032a5194d1 Mon Sep 17 00:00:00 2001 +From: "J. Nick Koston" <nick@koston.org> +Date: Sun, 2 Aug 2020 23:05:53 +0000 +Subject: [PATCH] Fix flapping chained task logging test + +Creating 20 tasks was taking less than 0.0001 seconds which caused +the tests to fail. Increase the number of test tasks by two orders +of magnitude. +--- + tests/test_core.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_core.py b/tests/test_core.py +index 12ed00fde2c9..167eda3f6cb4 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -1436,14 +1436,14 @@ async def test_chained_logging_hits_log_timeout(hass, caplog): + async def _task_chain_1(): + nonlocal created + created += 1 +- if created > 10: ++ if created > 1000: + return + hass.async_create_task(_task_chain_2()) + + async def _task_chain_2(): + nonlocal created + created += 1 +- if created > 10: ++ if created > 1000: + return + hass.async_create_task(_task_chain_1()) + |