git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112038 from mweinelt/home-assistant

home-assistant: 2021.2.0 -> 2021.2.1

commit39856245006d24fb468959a91c5b017d2fdb3d99 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateSat 6 Feb 2021, 04:50 (6 years ago) parent36cef175bdc1c5
4 files changed+34−34
compare with master
unifiedsplit
pkgs/development/python-modules/awesomeversion/default.nix+2−2 pkgs/development/python-modules/pyicloud/default.nix+22−16 pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/servers/home-assistant/default.nix+9−15
pkgs/development/python-modules/awesomeversion/default.nix+2−2
@@ -8,14 +8,14 @@
88
99buildPythonPackage rec {
1010 pname = "awesomeversion";
11− version = "21.2.0";
11+ version = "21.2.2";
1212 disabled = pythonOlder "3.8";
1313
1414 src = fetchFromGitHub {
1515 owner = "ludeeus";
1616 repo = pname;
1717 rev = version;
18− sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q";
18+ sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31";
1919 };
2020
2121 postPatch = ''
pkgs/development/python-modules/pyicloud/default.nix+22−16
@@ -1,40 +1,46 @@
11{ lib
22, buildPythonPackage
3−, fetchPypi
4−, requests
3+, fetchFromGitHub
4+, certifi
5+, click
56, keyring
67, keyrings-alt
7−, click
8+, pytz
9+, requests
810, six
911, tzlocal
10−, certifi
11−, bitstring
12−, unittest2
12+, pytest-mock
13+, pytestCheckHook
1314, future
1415}:
1516
1617buildPythonPackage rec {
1718 pname = "pyicloud";
18− version = "0.9.7";
19+ version = "0.10.2";
1920
20− src = fetchPypi {
21− inherit pname version;
22− sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c";
21+ src = fetchFromGitHub {
22+ owner = "picklepete";
23+ repo = pname;
24+ rev = version;
25+ sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy";
2326 };
2427
2528 propagatedBuildInputs = [
26− requests
29+ certifi
30+ click
31+ future
2732 keyring
2833 keyrings-alt
29− click
34+ pytz
35+ requests
3036 six
3137 tzlocal
32− certifi
33− bitstring
34− future
3538 ];
3639
37− checkInputs = [ unittest2 ];
40+ checkInputs = [
41+ pytest-mock
42+ pytestCheckHook
43+ ];
3844
3945 postPatch = ''
4046 sed -i \
pkgs/servers/home-assistant/component-packages.nix+1−1
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "2021.2.0";
5+ version = "2021.2.1";
66 components = {
77 "abode" = ps: with ps; [ abodepy ];
88 "accuweather" = ps: with ps; [ accuweather ];
pkgs/servers/home-assistant/default.nix+9−15
@@ -57,7 +57,7 @@ let
5757 extraBuildInputs = extraPackages py.pkgs;
5858
5959 # Don't forget to run parse-requirements.py after updating
60− hassVersion = "2021.2.0";
60+ hassVersion = "2021.2.1";
6161
6262in with py.pkgs; buildPythonApplication rec {
6363 pname = "homeassistant";
@@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec {
7676 owner = "home-assistant";
7777 repo = "core";
7878 rev = version;
79− sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa";
79+ sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m";
8080 };
8181
8282 # 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 {
101101 astral
102102 async-timeout
103103 attrs
104+ awesomeversion
104105 bcrypt
105106 certifi
106107 ciso8601
@@ -181,30 +182,23 @@ in with py.pkgs; buildPythonApplication rec {
181182
182183 pytestFlagsArray = [
183184 "-n auto"
185+ # assign tests grouped by file to workers
186+ "--dist loadfile"
184187 # don't bulk test all components
185188 "--ignore tests/components"
186− # prone to race conditions due to parallel file access
187− "--ignore tests/test_config.py"
188189 # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
189190 "--ignore tests/auth/mfa_modules/test_notify.py"
190191 "tests"
191192 ] ++ map (component: "tests/components/" + component) componentTests;
192193
193194 disabledTests = [
194− # AssertionError: assert 'unknown' == 'not_home'
195− "test_device_tracker_not_home"
195+ # AssertionError: assert 1 == 0
196+ "test_merge"
197+ # ModuleNotFoundError: No module named 'pyqwikswitch'
198+ "test_merge_id_schema"
196199 # keyring.errors.NoKeyringError: No recommended backend was available.
197200 "test_secrets_from_unrelated_fails"
198201 "test_secrets_credstash"
199− # AssertionError: Expected 'start' to have been called once. Called 0 times.
200− "test_setup_and_stop"
201− # AssertionError: assert {} == {'test': <ANY...ckage': <ANY>}
202− "test_get_custom_components_internal"
203− # assert 0 == 1 where 0 = len([])
204− "test_error_posted_as_event"
205− # RuntimeError: Event loop is closed
206− "test_config_path"
207− "test_info_endpoint_register_callback_timeout"
208202 ];
209203
210204 preCheck = ''