Merge master into staging-next

2021-05-08 00:46:50 +00:00
parent 4756e8716d 088da8735f
commit b4416b52c5
101 changed files with 7603 additions and 6456 deletions
@@ -176,6 +176,7 @@ in with py.pkgs; buildPythonApplication rec {
    # test infrastructure
    asynctest
    pytest-aiohttp
+    pytest-mock
    pytest-rerunfailures
    pytest-xdist
    pytestCheckHook
@@ -239,6 +240,7 @@ in with py.pkgs; buildPythonApplication rec {
    "folder"
    "folder_watcher"
    "freebox"
+    "fritz"
    "fritzbox"
    "fritzbox_callmonitor"
    "frontend"
@@ -359,6 +361,7 @@ in with py.pkgs; buildPythonApplication rec {
    "stream"
    "subaru"
    "sun"
+    "surepetcare"
    "switch"
    "system_health"
    "system_log"