From 0584f0082cbb0edb3ba64008eab0499dec418c47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 14:46:50 +0100 Subject: [PATCH 1/4] python3Packages.awesomeversion: 21.2.0 -> 21.2.2 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 8f832f827ed..2a532beca47 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.2.0"; + version = "21.2.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q"; + sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31"; }; postPatch = '' From 82e0a55f354d179f464adf7904daa776d4a380c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 14:51:50 +0100 Subject: [PATCH 2/4] python3Packages.pyicloud: 0.9.7 -> 0.10.2 --- .../python-modules/pyicloud/default.nix | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 6e808a01058..039d6259f36 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -1,40 +1,46 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, certifi +, click , keyring , keyrings-alt -, click +, pytz +, requests , six , tzlocal -, certifi -, bitstring -, unittest2 +, pytest-mock +, pytestCheckHook , future }: buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.7"; + version = "0.10.2"; - src = fetchPypi { - inherit pname version; - sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; + src = fetchFromGitHub { + owner = "picklepete"; + repo = pname; + rev = version; + sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; }; propagatedBuildInputs = [ - requests + certifi + click + future keyring keyrings-alt - click + pytz + requests six tzlocal - certifi - bitstring - future ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; postPatch = '' sed -i \ From 5684b8de3701ee41bb99785e35fb0b4073b17481 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 14:48:53 +0100 Subject: [PATCH 3/4] home-assistant: 2021.2.0 -> 2021.2.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b6c3a281f2e..14bdb0f738e 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.2.0"; + version = "2021.2.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1c24f6dd4f8..467d46f3354 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.2.0"; + hassVersion = "2021.2.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa"; + sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -101,6 +101,7 @@ in with py.pkgs; buildPythonApplication rec { astral async-timeout attrs + awesomeversion bcrypt certifi ciso8601 @@ -205,6 +206,7 @@ in with py.pkgs; buildPythonApplication rec { # RuntimeError: Event loop is closed "test_config_path" "test_info_endpoint_register_callback_timeout" + "test_scan_match_st" ]; preCheck = '' From 5bdc1c54ba3a735172b3a94e7c75b1c9e89dfe77 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Feb 2021 17:07:53 +0100 Subject: [PATCH 4/4] home-assistant: improve reliability of tests by grouping tests by file --- pkgs/servers/home-assistant/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 467d46f3354..977c58906ac 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -182,31 +182,23 @@ in with py.pkgs; buildPythonApplication rec { pytestFlagsArray = [ "-n auto" + # assign tests grouped by file to workers + "--dist loadfile" # don't bulk test all components "--ignore tests/components" - # prone to race conditions due to parallel file access - "--ignore tests/test_config.py" # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 "--ignore tests/auth/mfa_modules/test_notify.py" "tests" ] ++ map (component: "tests/components/" + component) componentTests; disabledTests = [ - # AssertionError: assert 'unknown' == 'not_home' - "test_device_tracker_not_home" + # AssertionError: assert 1 == 0 + "test_merge" + # ModuleNotFoundError: No module named 'pyqwikswitch' + "test_merge_id_schema" # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" - # AssertionError: Expected 'start' to have been called once. Called 0 times. - "test_setup_and_stop" - # AssertionError: assert {} == {'test': } - "test_get_custom_components_internal" - # assert 0 == 1 where 0 = len([]) - "test_error_posted_as_event" - # RuntimeError: Event loop is closed - "test_config_path" - "test_info_endpoint_register_callback_timeout" - "test_scan_match_st" ]; preCheck = ''