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

home-assistant: 2020.12.2 -> 2021.1.0 (+entourage)

commitc92a996c8f82467bcdd8566981d0c71b42c74833 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateThu 7 Jan 2021, 14:46 (6 years ago) parent8455fa31f7f70e
15 files changed+155−71
pkgs/development/python-modules/h11/default.nix+9−16 pkgs/development/python-modules/openwebifpy/default.nix+2−2 pkgs/development/python-modules/pyarlo/default.nix+41 pkgs/development/python-modules/uvicorn/default.nix+30−16 pkgs/development/python-modules/voluptuous/default.nix+2−2 pkgs/development/python-modules/zha-quirks/default.nix+17−9 pkgs/development/python-modules/zigpy-deconz/default.nix+20−11 pkgs/development/python-modules/zigpy-zigate/default.nix+2−2 pkgs/development/python-modules/zigpy-znp/default.nix+5 pkgs/development/python-modules/zigpy/default.nix+4−2 pkgs/servers/home-assistant/component-packages.nix+5−6 pkgs/servers/home-assistant/default.nix+10−2 pkgs/servers/home-assistant/frontend.nix+5−2 pkgs/servers/home-assistant/update.sh+1−1 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/h11/default.nix+9−16
@@ -1,33 +1,26 @@
1−{ lib, buildPythonPackage, fetchPypi, pytest, fetchpatch }:
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pytestCheckHook
5+}:
26
37buildPythonPackage rec {
48 pname = "h11";
5− version = "0.9.0";
9+ version = "0.12.0";
610
711 src = fetchPypi {
812 inherit pname version;
9− sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k";
13+ sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7";
1014 };
1115
12− patches = [
13− # pytest5 compatability
14− (fetchpatch {
15− url = "https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch";
16− sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39";
17− })
18− ];
19−
20− checkInputs = [ pytest ];
21−
22− checkPhase = ''
23− py.test
24− '';
16+ checkInputs = [ pytestCheckHook ];
2517
2618 # Some of the tests use localhost networking.
2719 __darwinAllowLocalNetworking = true;
2820
2921 meta = with lib; {
3022 description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
23+ homepage = "https://github.com/python-hyper/h11";
3124 license = licenses.mit;
3225 };
3326}
pkgs/development/python-modules/openwebifpy/default.nix+2−2
@@ -4,12 +4,12 @@
44
55buildPythonPackage rec {
66 pname = "openwebifpy";
7− version = "3.1.1";
7+ version = "3.2.7";
88 disabled = pythonOlder "3.6";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2";
12+ sha256 = "0n9vi6b0y8b41fd7m9p361y3qb5m3b9p9d8g4fasqi7yy4mw2hns";
1313 };
1414
1515 propagatedBuildInputs = [
pkgs/development/python-modules/pyarlo/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, mock
5+, pytestCheckHook
6+, requests
7+, requests-mock
8+, sseclient-py
9+}:
10+
11+buildPythonPackage rec {
12+ pname = "pyarlo";
13+ version = "0.2.4";
14+
15+ src = fetchFromGitHub {
16+ owner = "tchellomello";
17+ repo = "python-arlo";
18+ rev = version;
19+ sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3";
20+ };
21+
22+ propagatedBuildInputs = [
23+ requests
24+ sseclient-py
25+ ];
26+
27+ checkInputs = [
28+ pytestCheckHook
29+ mock
30+ requests-mock
31+ ];
32+
33+ pythonImportsCheck = [ "pyarlo" ];
34+
35+ meta = with lib; {
36+ description = "Python library to work with Netgear Arlo cameras";
37+ homepage = "https://github.com/tchellomello/python-arlo";
38+ license = with licenses; [ lgpl3Plus ];
39+ maintainers = with maintainers; [ fab ];
40+ };
41+}
pkgs/development/python-modules/uvicorn/default.nix+30−16
@@ -1,4 +1,5 @@
11{ stdenv
2+, lib
23, buildPythonPackage
34, fetchFromGitHub
45, click
@@ -7,21 +8,26 @@
78, uvloop
89, websockets
910, wsproto
10−, pytest
11+, pytestCheckHook
12+, pytest-mock
13+, pyyaml
1114, requests
15+, trustme
16+, typing-extensions
1217, isPy27
18+, pythonOlder
1319}:
1420
1521buildPythonPackage rec {
1622 pname = "uvicorn";
17− version = "0.11.5";
23+ version = "0.13.2";
1824 disabled = isPy27;
1925
2026 src = fetchFromGitHub {
2127 owner = "encode";
2228 repo = pname;
2329 rev = version;
24− sha256 = "0cf0vw6kzxwlkvk5gw85wv3kg1kdil0wkq3s7rmxpvrk6gjk8jvq";
30+ sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
2531 };
2632
2733 propagatedBuildInputs = [
@@ -31,25 +37,33 @@ buildPythonPackage rec {
3137 uvloop
3238 websockets
3339 wsproto
40+ ] ++ lib.optionals (pythonOlder "3.8") [
41+ typing-extensions
3442 ];
3543
36− postPatch = ''
37− substituteInPlace setup.py \
38− --replace "h11==0.8.*" "h11" \
39− --replace "httptools==0.0.13" "httptools"
40− '';
41−
42− checkInputs = [ pytest requests ];
44+ checkInputs = [
45+ pytestCheckHook
46+ pytest-mock
47+ pyyaml
48+ requests
49+ trustme
50+ ];
4351
4452 doCheck = !stdenv.isDarwin;
4553
46− # watchgod required the watchgod package, which isn't available in nixpkgs
47− checkPhase = ''
48− pytest --ignore=tests/supervisors/test_watchgodreload.py \
49− -k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]'
50− '';
54+ __darwinAllowLocalNetworking = true;
55+
56+ pytestFlagsArray = [
57+ # watchgod required the watchgod package, which isn't available in nixpkgs
58+ "--ignore=tests/supervisors/test_reload.py"
59+ ];
60+
61+ disabledTests = [
62+ "test_supported_upgrade_request"
63+ "test_invalid_upgrade"
64+ ];
5165
52− meta = with stdenv.lib; {
66+ meta = with lib; {
5367 homepage = "https://www.uvicorn.org/";
5468 description = "The lightning-fast ASGI server";
5569 license = licenses.bsd3;
pkgs/development/python-modules/voluptuous/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "voluptuous";
5− version = "0.12.0";
5+ version = "0.12.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1p5j3fgbpqj31fajkaisdrz10ah9667sijz4kp3m0sbgw6ag4kis";
9+ sha256 = "0js4avmhmmys78z376xk1w9305hq5nad8zqrnksgmpc1j90p4db6";
1010 };
1111
1212 checkInputs = [ nose ];
pkgs/development/python-modules/zha-quirks/default.nix+17−9
@@ -1,19 +1,27 @@
1−{ lib, buildPythonPackage, fetchPypi
2−, aiohttp, zigpy, conftest, asynctest
3−, pytestCheckHook }:
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, aiohttp
5+, zigpy
6+, conftest
7+, asynctest
8+, pytestCheckHook
9+}:
410
511buildPythonPackage rec {
612 pname = "zha-quirks";
7− version = "0.0.47";
13+ version = "0.0.51";
14+
15+ src = fetchFromGitHub {
16+ owner = "zigpy";
17+ repo = "zha-device-handlers";
18+ rev = version;
19+ sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9";
20+ };
821
922 propagatedBuildInputs = [ aiohttp zigpy ];
1023 checkInputs = [ pytestCheckHook conftest asynctest ];
1124
12− src = fetchPypi {
13− inherit pname version;
14− sha256 = "bf7dbd5d1c1a3849b059e62afcef248b6955f5ceef78f87201ae2fc8420738de";
15− };
16−
1725 meta = with lib; {
1826 description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
1927 homepage = "https://github.com/dmulcahey/zha-device-handlers";
pkgs/development/python-modules/zigpy-deconz/default.nix+20−11
@@ -1,20 +1,29 @@
1−{ stdenv, buildPythonPackage, fetchPypi
2−, pyserial, pyserial-asyncio, zigpy
3−, pytest, pytest-asyncio, asynctest }:
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, pyserial
5+, pyserial-asyncio
6+, zigpy
7+, pytestCheckHook
8+, pytest-asyncio
9+, asynctest
10+}:
411
512buildPythonPackage rec {
613 pname = "zigpy-deconz";
7− version = "0.11.0";
14+ version = "0.11.1";
815
9− propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
10− checkInputs = [ pytest pytest-asyncio asynctest ];
11−
12− src = fetchPypi {
13− inherit pname version;
14− sha256 = "a2263f8bc5807ebac55bb665eca553b514384ce270b66f83df02c39184193020";
16+ src = fetchFromGitHub {
17+ owner = "zigpy";
18+ repo = pname;
19+ rev = version;
20+ sha256 = "1p9mdsfc200iyszppcflazzfwqg4v8nqqwqsx114nip5km7a5s37";
1521 };
1622
17− meta = with stdenv.lib; {
23+ propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
24+ checkInputs = [ pytestCheckHook pytest-asyncio asynctest ];
25+
26+ meta = with lib; {
1827 description = "Library which communicates with Deconz radios for zigpy";
1928 homepage = "https://github.com/zigpy/zigpy-deconz";
2029 license = licenses.gpl3Plus;
pkgs/development/python-modules/zigpy-zigate/default.nix+2−2
@@ -12,7 +12,7 @@
1212
1313buildPythonPackage rec {
1414 pname = "zigpy-zigate";
15− version = "0.7.3";
15+ version = "0.7.4";
1616 # https://github.com/Martiusweb/asynctest/issues/152
1717 # broken by upstream python bug with asynctest and
1818 # is used exclusively by home-assistant with python 3.8
@@ -22,7 +22,7 @@ buildPythonPackage rec {
2222 owner = "zigpy";
2323 repo = "zigpy-zigate";
2424 rev = version;
25− sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1";
25+ sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d";
2626 };
2727
2828 propagatedBuildInputs = [
pkgs/development/python-modules/zigpy-znp/default.nix+5
@@ -45,6 +45,11 @@ buildPythonPackage rec {
4545 pytestCheckHook
4646 ];
4747
48+ disabledTests = [
49+ # zigpy-znp was too slow to sync up with the zigpy 0.29 release and has API breakage, remove >0.3.0
50+ "test_force_remove"
51+ ];
52+
4853 meta = with stdenv.lib; {
4954 description = "A library for zigpy which communicates with TI ZNP radios";
5055 homepage = "https://github.com/zha-ng/zigpy-znp";
pkgs/development/python-modules/zigpy/default.nix+4−2
@@ -1,5 +1,6 @@
11{ lib
22, aiohttp
3+, aiosqlite
34, asynctest
45, buildPythonPackage
56, crccheck
@@ -14,17 +15,18 @@
1415
1516buildPythonPackage rec {
1617 pname = "zigpy";
17− version = "0.26.0";
18+ version = "0.29.0";
1819
1920 src = fetchFromGitHub {
2021 owner = "zigpy";
2122 repo = "zigpy";
2223 rev = version;
23− sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs=";
24+ sha256 = "1r4i2ya9f241rls9mi24dksx4srrzi8agshnqy12rclxlh7qb1aw";
2425 };
2526
2627 propagatedBuildInputs = [
2728 aiohttp
29+ aiosqlite
2830 crccheck
2931 pycrypto
3032 pycryptodome
pkgs/servers/home-assistant/component-packages.nix+5−6
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "2020.12.2";
5+ version = "2021.1.0";
66 components = {
77 "abode" = ps: with ps; [ abodepy ];
88 "accuweather" = ps: with ps; [ accuweather ];
@@ -45,7 +45,7 @@
4545 "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
4646 "arduino" = ps: with ps; [ ]; # missing inputs: PyMata
4747 "arest" = ps: with ps; [ ];
48− "arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo
48+ "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ];
4949 "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg
5050 "aruba" = ps: with ps; [ pexpect ];
5151 "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ];
@@ -60,9 +60,8 @@
6060 "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
6161 "auth" = ps: with ps; [ aiohttp-cors ];
6262 "automation" = ps: with ps; [ aiohttp-cors ];
63− "avea" = ps: with ps; [ ]; # missing inputs: avea
63+ "avea" = ps: with ps; [ avea ];
6464 "avion" = ps: with ps; [ ]; # missing inputs: avion
65− "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api
6665 "awair" = ps: with ps; [ ]; # missing inputs: python_awair
6766 "aws" = ps: with ps; [ aiobotocore ];
6867 "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis
@@ -528,7 +527,7 @@
528527 "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver
529528 "namecheapdns" = ps: with ps; [ defusedxml ];
530529 "nanoleaf" = ps: with ps; [ pynanoleaf ];
531− "neato" = ps: with ps; [ pybotvac ];
530+ "neato" = ps: with ps; [ aiohttp-cors pybotvac ];
532531 "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
533532 "nello" = ps: with ps; [ ]; # missing inputs: pynello
534533 "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
@@ -624,7 +623,7 @@
624623 "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
625624 "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise
626625 "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
627− "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
626+ "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts
628627 "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
629628 "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
630629 "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
pkgs/servers/home-assistant/default.nix+10−2
@@ -62,7 +62,7 @@ let
6262 extraBuildInputs = extraPackages py.pkgs;
6363
6464 # Don't forget to run parse-requirements.py after updating
65− hassVersion = "2020.12.2";
65+ hassVersion = "2021.1.0";
6666
6767in with py.pkgs; buildPythonApplication rec {
6868 pname = "homeassistant";
@@ -71,6 +71,9 @@ in with py.pkgs; buildPythonApplication rec {
7171 # check REQUIRED_PYTHON_VER in homeassistant/const.py
7272 disabled = pythonOlder "3.7.1";
7373
74+ # don't try and fail to strip 6600+ python files, it takes minutes!
75+ dontStrip = true;
76+
7477 inherit availableComponents;
7578
7679 # PyPI tarball is missing tests/ directory
@@ -78,7 +81,7 @@ in with py.pkgs; buildPythonApplication rec {
7881 owner = "home-assistant";
7982 repo = "core";
8083 rev = version;
81− sha256 = "1hd3z0bvscrg0ihy26djm1x9cj1pkdbnsgpzhdy42j8vy80q9bxr";
84+ sha256 = "14njb2j16h536xq5df4zpna874fxjcd6fqr881y6mq081f00i0r0";
8285 };
8386
8487 # leave this in, so users don't have to constantly update their downstream patch handling
@@ -176,6 +179,11 @@ in with py.pkgs; buildPythonApplication rec {
176179 "test_cached_event_message"
177180 # ValueError: count must be a positive integer (got 0)
178181 "test_media_view"
182+ # AssertionError: len(events) == 1
183+ "test_error_posted_as_event"
184+ # keyring.errors.NoKeyringError: No recommended backend was available.
185+ "test_secrets_from_unrelated_fails"
186+ "test_secrets_credstash"
179187 ];
180188
181189 preCheck = ''
pkgs/servers/home-assistant/frontend.nix+5−2
@@ -4,13 +4,16 @@ buildPythonPackage rec {
44 # the frontend version corresponding to a specific home-assistant version can be found here
55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
66 pname = "home-assistant-frontend";
7− version = "20201212.0";
7+ version = "20201229.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "1nz5f7bpj0xs740af8i6j33idff6yzx7z9vydlah2sxcdgpwmz84";
11+ sha256 = "sha256-3JMWugAiVDq/NBgX8ft2Bchim2g493jy7wZvvXrX+Ws=";
1212 };
1313
14+ # there is nothing to strip in this package
15+ dontStrip = true;
16+
1417 # no Python tests implemented
1518 doCheck = false;
1619
pkgs/servers/home-assistant/update.sh+1−1
@@ -31,4 +31,4 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \
3131)
3232
3333git add ./component-packages.nix ./default.nix ./frontend.nix
34−git commit -m "homeassistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
34+git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
pkgs/top-level/python-packages.nix+2
@@ -5024,6 +5024,8 @@ in {
50245024
50255025 pyannotate = callPackage ../development/python-modules/pyannotate { };
50265026
5027+ pyarlo = callPackage ../development/python-modules/pyarlo { };
5028+
50275029 pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; };
50285030
50295031 pyasn1 = callPackage ../development/python-modules/pyasn1 { };