From 08d8901e943f8c98465699ddbb94254b5f2f5b1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Jun 2023 20:28:03 +0200 Subject: [PATCH 1/9] python310Packages.home-assistant-chip-core: 2023.5.3 -> 2023.6.0 https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.6.0 --- .../python-modules/home-assistant-chip-core/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 23f48886daa3..ea6dc79d51d9 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -8,6 +8,7 @@ , autoPatchelfHook # runtime +, libnl , openssl_1_1 # propagates @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.5.3"; + version = "2023.6.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -36,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ="; + hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0="; + hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -58,6 +59,7 @@ buildPythonPackage rec { ]; buildInputs = [ + libnl openssl_1_1 ]; From 832d59ea58df2bed50a5f90f728dcc4e9f41f973 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Jun 2023 20:30:13 +0200 Subject: [PATCH 2/9] python310Packages.home-assistant-chip-clusters: 2023.5.3 -> 2023.6.0 https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.6.0 --- .../python-modules/home-assistant-chip-clusters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 663d4e4c0b3b..d91b01f52cc9 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.5.3"; + version = "2023.6.0"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY="; + hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; }; propagatedBuildInputs = [ From 6d12f3c8b73a5275b66e68805a3e547c7e9a7c09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Jun 2023 20:31:15 +0200 Subject: [PATCH 3/9] python310Packages.python-matter-server: 3.4.2 -> 3.5.2 https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.5.0 https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.5.1 https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.5.2 --- .../python-modules/python-matter-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 1f7722ec4207..422c38aa517e 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.4.2"; + version = "3.5.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I="; + hash = "sha256-sLVKhQIqJanvupfkJSLObHTiyGE+PP8UdQR2my1azUA="; }; nativeBuildInputs = [ From 703c61886ac887826e20248330fb281a068d91c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Jun 2023 21:19:06 +0200 Subject: [PATCH 4/9] python310Packages.ical: 4.5.3 -> 4.5.4 https://github.com/allenporter/ical/releases/tag/4.5.4 --- pkgs/development/python-modules/ical/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index b2d5cc0bd86c..74f444485872 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -13,12 +13,13 @@ , pytest-golden , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml }: buildPythonPackage rec { pname = "ical"; - version = "4.5.3"; + version = "4.5.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,9 +28,17 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU="; + hash = "sha256-UcuJ23yzpRHDUFlwov692UyLXP/9Qb4F+IJIszo12/M="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "tzdata" + ]; + propagatedBuildInputs = [ emoji python-dateutil From c784d47cabb078fd5b612d61ce385e95ab48fba8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Jun 2023 21:23:10 +0200 Subject: [PATCH 5/9] python310Packages.bthome-ble: 2.11.3 -> 2.12.0 https://github.com/bluetooth-devices/bthome-ble/blob/v2.12.0/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index d1771f97c793..6285f09ec32d 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -7,12 +7,13 @@ , pycryptodomex , pytestCheckHook , pythonOlder +, pytz , sensor-state-data }: buildPythonPackage rec { pname = "bthome-ble"; - version = "2.11.3"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-axumlQnD7MKGdmy1gGQNU4B/3jXffK2jTyO3BtWvp5w="; + hash = "sha256-SonB0pT6sC6kpFmIMzNeASUHyuik4HOOquWx6+K05Y8="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { bluetooth-sensor-state-data sensor-state-data pycryptodomex + pytz ]; nativeCheckInputs = [ From 65360ec9c46541ab0ee680850805ed312b44495f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Jun 2023 22:16:38 +0200 Subject: [PATCH 6/9] python311Packages.homeassistant-stubs: 2023.6.2 -> 2023.6.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.6.3 --- pkgs/servers/home-assistant/stubs.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5a19437fb23e..85f7cce8d3ac 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.6.2"; + version = "2023.6.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms="; + hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc="; }; nativeBuildInputs = [ @@ -30,7 +30,6 @@ buildPythonPackage rec { substituteInPlace pyproject.toml --replace \ 'homeassistant = "${version}"' \ 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' - cat pyproject.toml ''; pythonImportsCheck = [ From 6b4f9866f039008ac50f662b09bcbbd3bd517f8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Jun 2023 22:16:51 +0200 Subject: [PATCH 7/9] home-assistant: 2023.6.2 -> 2023.6.3 https://github.com/home-assistant/core/releases/tag/2023.6.3 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 17 ++++------------- pkgs/servers/home-assistant/tests.nix | 12 ++++++++++++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7547228bef26..635763c8768f 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 = "2023.6.2"; + version = "2023.6.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3262dd2af806..4687181bef8e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -231,15 +231,6 @@ let doCheck = false; }); - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.12"; - src = fetchPypi { - pname = "SQLAlchemy"; - inherit version; - hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w="; - }; - }); - # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -296,7 +287,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.6.2"; + hassVersion = "2023.6.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +303,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0="; + hash = "sha256-hlU2LNG/9Uy7XfST/ZwVOQCar0IFvFUgpMSoSCviTrc="; }; # Secondary source is git for tests @@ -320,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8="; + hash = "sha256-V/ndNu8zvtI8Z0LzrlWaV+EbeL8oBBz/D46ec+fhPPY="; }; nativeBuildInputs = with python.pkgs; [ @@ -357,7 +348,7 @@ in python.pkgs.buildPythonApplication rec { "PyJWT" "pyOpenSSL" "requests" - "typing-extensions" + "typing_extensions" "voluptuous-serialize" "yarl" ]; diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 91a902a8a2d7..5b058ffb92b9 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -47,6 +47,9 @@ let }; extraPytestFlagsArray = { + conversation = [ + "--deselect tests/components/conversation/test_init.py::test_get_agent_list" + ]; dnsip = [ # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" @@ -63,10 +66,19 @@ let # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + sonos = [ + # KeyError: 'sonos_media_player' + "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings" + "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3" + ]; unifiprotect = [ # "TypeError: object Mock can't be used in 'await' expression "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" ]; + zha = [ + "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp" + "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp" + ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { From 8ab140c9b60227536491cd2e82d5aebb4246ca8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Jun 2023 23:31:00 +0200 Subject: [PATCH 8/9] python311Packages.exceptiongroup: disable failing test --- pkgs/development/python-modules/exceptiongroup/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 5e7930bbc9cd..e6f40fa90ebd 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -33,6 +33,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = if (pythonAtLeast "3.11") then [ + # regression in 3.11.4 + # https://github.com/agronholm/exceptiongroup/issues/64 + "test_catch_handler_raises" + ] else null; + pythonImportsCheck = [ "exceptiongroup" ]; From 198f23d10c80398c1e52d9f3498a3021dfa5d90c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Jun 2023 23:42:05 +0200 Subject: [PATCH 9/9] python311Packages.restrictedpython: disable failing test --- pkgs/development/python-modules/restrictedpython/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 08df5a3d9fd5..cf8ceb3e96f6 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -24,6 +25,10 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_compile__compile_restricted_exec__5" + ]; + pythonImportsCheck = [ "RestrictedPython" ];