From dbda559896a98379319cf8f78d2d480e700b9b48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 01:51:13 +0200 Subject: [PATCH 01/13] python312Packages.tenacity: 8.4.1 -> 9.0.0 https://github.com/jd/tenacity/releases/tag/8.4.2 https://github.com/jd/tenacity/releases/tag/8.5.0 https://github.com/jd/tenacity/releases/tag/9.0.0 --- .../development/python-modules/tenacity/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 5ac8b3e2c963..0def5a032243 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pbr, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -13,20 +12,17 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.4.1"; - format = "pyproject"; + version = "9.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VLFBK4eN334fFXfNSVJ7rYze8yQhvVmb6sDGw/EFgv0="; + hash = "sha256-gH83ypfWKqNhJk1Jew4x6SuAJwRJQr+nVhYNkIMg1zs="; }; - nativeBuildInputs = [ - pbr - setuptools-scm - ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ pytest-asyncio @@ -39,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jd/tenacity"; + changelog = "https://github.com/jd/tenacity/releases/tag/${version}"; description = "Retrying library for Python"; license = licenses.asl20; maintainers = with maintainers; [ jakewaksbaum ]; From 0aa7b78120ef1f155d7db6dd6df5d9fc12704f84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 01:55:31 +0200 Subject: [PATCH 02/13] python312Packages.doorbirdpy: 3.0.3 -> 3.0.5 https://gitlab.com/klikini/doorbirdpy/-/tags/3.0.5 --- .../python-modules/doorbirdpy/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index acb4fab9c31b..b0ae8cfcea08 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -4,6 +4,7 @@ fetchFromGitLab, setuptools, aiohttp, + tenacity, aioresponses, pytest-asyncio, pytestCheckHook, @@ -11,19 +12,22 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "3.0.3"; + version = "3.0.5"; pyproject = true; src = fetchFromGitLab { owner = "klikini"; repo = "doorbirdpy"; rev = "refs/tags/${version}"; - hash = "sha256-0UvzMFYKM/Sb9B2XwZwl+a9v7lTxAc1H59vR88VwDww="; + hash = "sha256-SVkprX9fMy1uGixsxsE7gbUJndvl+V/kle3Rq34S6Hs="; }; build-system = [ setuptools ]; - dependencies = [ aiohttp ]; + dependencies = [ + aiohttp + tenacity + ]; nativeCheckInputs = [ aioresponses @@ -31,6 +35,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # connection error on mock host + "test_info_auth_fails" + ]; + pythonImportsCheck = [ "doorbirdpy" ]; meta = with lib; { From bfe48969d552972633b9d21a1ae6178aa91fa2a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 01:56:57 +0200 Subject: [PATCH 03/13] python312Packages.pytibber: 0.30.2 -> 0.30.3 https://github.com/Danielhiversen/pyTibber/releases/tag/0.30.3 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 94810bfac05d..1b7af821ade9 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.30.2"; + version = "0.30.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-9Tnn68RxKwEruYEGo2pZQTQTlYnVMfa3MRzA55HlBRc="; + hash = "sha256-4MkREdeYqAA+MpM9JQyiVVDPpefVTNT0x0ptR33K6yU="; }; build-system = [ setuptools ]; From 2c43765d8c1279922b24b6b2a9889d2be5d57479 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:03:35 +0200 Subject: [PATCH 04/13] home-assistant: 2024.10.3 -> 2024.10.4 https://github.com/home-assistant/core/releases/tag/2024.10.4 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 26 ++-------- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 50 +++++-------------- 4 files changed, 19 insertions(+), 63 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8fe00f2433a4..1fbed178c406 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 = "2024.10.3"; + version = "2024.10.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 94b9758dccb5..c39617fc84ca 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -100,16 +100,6 @@ let ]; }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { - version = "2.5.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-AcImffYki1gnIaZp/1eacNjdDgjn6qinPJXq9jYtoRg="; - }; - doCheck = false; - }); - gspread = super.gspread.overridePythonAttrs (oldAttrs: rec { version = "5.12.4"; src = fetchFromGitHub { @@ -174,15 +164,6 @@ let }; }); - pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { - version = "0.4.8"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-rvd8n7lKOsWI6HhBIIvexGRHHZhxvVBQoofMmkdc0Lo="; - }; - }); - # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; @@ -323,6 +304,7 @@ let doCheck = false; # Tests changed a lot for > 3 }); + # pinned for sigstore tuf = super.tuf.overridePythonAttrs rec { version = "2.1.0"; src = fetchFromGitHub { @@ -408,7 +390,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.3"; + hassVersion = "2024.10.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +408,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-kxxa7FI2wIpE3bEifNyjtEHj7rsuImQvxGd6I46ySqM="; + hash = "sha256-uaGGt5qCdyFXuEtg20MzmFd4PXkdPP8h4HJBvRV6sz8="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-DhDdCvov5/Yf2MnY2veV8W/lYk3LTDzxYpbAsbjxWcg="; + hash = "sha256-al45WS8SIgOM2TqGPIptZU7iNMapYUg+fK2MLh68lxs="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 70c92b8bcec7..bb9cc204bf59 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241002.3"; + version = "20241002.4"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-O1Yb5bCaKoS/Owwb0I0bF2neN2YTOnu28ruVA1cnFzk="; + hash = "sha256-b1/VrN0r/7rvSCjSn9HugKLaA40yl4AsFugzmCZKzd8="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 07fc9a00b999..4f1ae7204fad 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -3,27 +3,21 @@ }: let + getComponentDeps = component: home-assistant.getPackages component home-assistant.python.pkgs; + # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { - airzone_cloud = [ - aioairzone - ]; - androidtv = home-assistant.getPackages "asuswrt" home-assistant.python.pkgs; - bluetooth = [ - pyswitchbot - ]; + axis = getComponentDeps "deconz"; govee_ble = [ ibeacon-ble ]; + hassio = getComponentDeps "homeassistant_yellow"; lovelace = [ pychromecast ]; matrix = [ pydantic ]; - mopeka = [ - pyswitchbot - ]; onboarding = [ pymetno radios @@ -41,9 +35,6 @@ let system_log = [ isal ]; - tilt_ble = [ - ibeacon-ble - ]; xiaomi_miio = [ arrow ]; @@ -59,22 +50,6 @@ let }; extraDisabledTests = { - advantage_air = [ - # AssertionError: assert 2 == 1 (Expected two calls, got one) - "test_binary_sensor_async_setup_entry" - ]; - hassio = [ - # fails to load the hardware component - "test_device_registry_calls" - ]; - husqvarna_automower = [ - # snapshot mismatch - "test_device_diagnostics" - ]; - recorder = [ - # call not happening, likely due to timezone issues - "test_auto_purge" - ]; shell_command = [ # tries to retrieve file from github "test_non_text_stdout_capture" @@ -84,16 +59,12 @@ let "test_sensor_entities" ]; websocket_api = [ - # racy + # AssertionError: assert 'unknown_error' == 'template_error' "test_render_template_with_timeout" ]; }; extraPytestFlagsArray = { - cloud = [ - # Tries to connect to alexa-api.nabucasa.com:443 - "--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state" - ]; dnsip = [ # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" @@ -109,10 +80,13 @@ let # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; - velux = [ - # uses unmocked sockets - "--deselect tests/components/velux/test_config_flow.py::test_user_success" - "--deselect tests/components/velux/test_config_flow.py::test_import_valid_config" + sql = [ + "-W" + "ignore::sqlalchemy.exc.SAWarning" + ]; + vicare = [ + # Snapshot 'test_all_entities[sensor.model0_electricity_consumption_today-entry]' does not exist! + "--deselect=tests/components/vicare/test_sensor.py::test_all_entities" ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( From fb6537280bb9493d126199806707a802163f0370 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 03:57:05 +0200 Subject: [PATCH 05/13] python312Packages.homeassistant-stubs: 2024.10.2 -> 2024.10.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.10.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 25f33e9fb321..efd82a902f22 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.10.2"; + version = "2024.10.4"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-6aFZiJKPuUdnC3YzSHyJgn2iTHfP8MCwx17I7uxVTNg="; + hash = "sha256-MjHqX1OP1mEEypAxZ8Xc+ZWBsfj4yiFG9oItFnf/svk="; }; build-system = [ From 9e75ee84b71449b5d0d14cfd7e309a78fae0297d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:20:31 +0200 Subject: [PATCH 06/13] python312Packages.linear-garage-door: relax tenacity constraint --- .../python-modules/linear-garage-door/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix index 1a8bfb796410..f3ea213b038b 100644 --- a/pkgs/development/python-modules/linear-garage-door/default.nix +++ b/pkgs/development/python-modules/linear-garage-door/default.nix @@ -23,14 +23,10 @@ buildPythonPackage rec { hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4="; }; - postPatch = '' - sed -i pyproject.toml \ - -e "/--cov/d" \ - -e "/--no-cov/d" - ''; - build-system = [ poetry-core ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = [ aiohttp dnspython From 8ec577c8e9224152b07a8b70396d505cbba6cfe7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:22:49 +0200 Subject: [PATCH 07/13] python312Packages.py-aosmith: relax tenacity constraint, modernize --- pkgs/development/python-modules/py-aosmith/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix index 5b504e647ea6..199011b934b1 100644 --- a/pkgs/development/python-modules/py-aosmith/default.nix +++ b/pkgs/development/python-modules/py-aosmith/default.nix @@ -22,9 +22,11 @@ buildPythonPackage rec { hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "tenacity" ]; + + dependencies = [ aiohttp tenacity ]; From ef5574cd3ab25161cfbe0b89dc43510666941392 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:23:56 +0200 Subject: [PATCH 08/13] offat: relax tenacity constraint --- pkgs/by-name/of/offat/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 46bbba00f771..83bb81df0fc8 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -18,7 +18,10 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "${src.name}/src"; - pythonRelaxDeps = [ "setuptools" ]; + pythonRelaxDeps = [ + "setuptools" + "tenacity" + ]; build-system = with python3.pkgs; [ poetry-core ]; From c3017895fff266313a0365ffef1bfcf94b16d45c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:28:30 +0200 Subject: [PATCH 09/13] luigi: relax tenacity constraint --- pkgs/applications/networking/cluster/luigi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 8c145ef6393f..158c8ff8242e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -12,6 +12,8 @@ python3.pkgs.buildPythonApplication rec { build-system = [ python3.pkgs.setuptools ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = with python3.pkgs; [ python-dateutil tornado python-daemon tenacity ]; pythonImportsCheck = [ "luigi" ]; From 80e1a610f1d77f0882090146bf57d7d219781457 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:34:21 +0200 Subject: [PATCH 10/13] python312Packages.langchain-core: relax tenacity constraint --- pkgs/development/python-modules/langchain-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 3ba1fcb50f95..78a0cf0f026f 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -48,6 +48,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = [ jsonpatch langsmith From ca86d6180942c49aac976fab8dc2c0d012169eb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 02:35:35 +0200 Subject: [PATCH 11/13] python312Packages.qcs-api-client: relax tenacity constraint --- pkgs/development/python-modules/qcs-api-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 34984ec5755e..9d903f4fe064 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { "httpx" "iso8601" "pydantic" + "tenacity" ]; build-system = [ poetry-core ]; From f2636e121e2f827795ec737bd6d3d27e94194128 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 04:03:42 +0200 Subject: [PATCH 12/13] python312Packages.langchain: relax tenacity constraint --- pkgs/development/python-modules/langchain/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 49b268e97acc..e96e44365e04 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -58,6 +58,8 @@ buildPythonPackage rec { buildInputs = [ bash ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = [ aiohttp langchain-core From 0ee813aa9d7b56148d64997370357ea0eb2d2c6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Oct 2024 04:13:24 +0200 Subject: [PATCH 13/13] python312Packages.osxphotos: relax tenacity constraint --- pkgs/development/python-modules/osxphotos/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 0af996f622a8..f22e7e34d9aa 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -77,6 +77,7 @@ buildPythonPackage rec { "more-itertools" "objexplore" "textx" + "tenacity" ]; pythonImportsCheck = [ "osxphotos" ];