diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 2590f7136eb9..c3149189b538 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -30,17 +30,25 @@ python3Packages.buildPythonApplication rec { hatchling ]; - dependencies = with python3Packages; [ - brotli - certifi - curl-cffi - mutagen - pycryptodomex - requests - secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` - urllib3 - websockets - ]; + # expose optional-dependencies, but provide all features + dependencies = lib.flatten (lib.attrValues optional-dependencies); + + optional-dependencies = { + default = with python3Packages; [ + brotli + certifi + mutagen + pycryptodomex + requests + urllib3 + websockets + ]; + curl-cffi = [ python3Packages.curl-cffi ]; + secretstorage = with python3Packages; [ + cffi + secretstorage + ]; + }; pythonRelaxDeps = [ "websockets" ]; diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 5e43a0548088..7e3a59cdb392 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2024.10.27.post5"; + version = "2024.11.6"; pyproject = true; src = fetchPypi { inherit version; pname = "ytdl_sub"; - hash = "sha256-NVIQOoRAyiFtc83r7z7DfDiIdWIPmUwylNzG3KSyOXw="; + hash = "sha256-YMki+1rC726RtbZceoVbcpk/Gi3F81xxERQjpqLjn+A="; }; build-system = with python3Packages; [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 5e5499e2bcaa..685e50650602 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.7"; + version = "0.6.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-6M80Qm5stk3wsZ55wcrJc8Y/TDd5zLWwiOhKj+5FQHs="; + hash = "sha256-H78vlCGJhIE1/utX4Dh1vssOwYnQxCytsEs+hpOPVtM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 8884f0ef904f..9caf6af5bbbf 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -9,14 +9,16 @@ poetry-core, pyjwt, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, + tzlocal, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.10.0"; + version = "2024.10.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,14 +27,13 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-qWXFkz1yIpSDGFilVZK0n+hEUs7osfO+2xfknr2cOZY="; + hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ poetry-core ]; @@ -42,11 +43,13 @@ buildPythonPackage rec { ical mashumaro pyjwt + tzlocal ]; nativeCheckInputs = [ freezegun pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 4d6f597fb2a9..461fe2c4ff43 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "27.0.0"; + version = "27.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-2FA0QleMJG69vhyC85tO4ZAY0U8qPIdyJROHKxC35GM="; + hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8="; }; build-system = [ @@ -70,6 +70,11 @@ buildPythonPackage rec { "test_start_connection_can_only_increase_buffer_size_to_262144" ]; + disabledTestPaths = [ + # benchmarking requires pytest-codespeed + "tests/test_bluetooth_benchmarks.py" + ]; + pythonImportsCheck = [ "aioesphomeapi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 969e72889da6..2f906fef1954 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-Jq9cSdMMXVgRHhQK1LuGwVR6GBTIrw3th7y9huRSQjM="; + hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index eb6524e1d2fb..1887ed1cebf1 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.4"; + version = "3.2.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-9TvpdsWmNXz7UAh0BCgjdRWLKCP2FdE8TIjvyDXydLU="; + hash = "sha256-2mo7huHnac17FzBK0z1iCFOTkTUBohvOVUJ1226w7Ks="; }; build-system = [ poetry-core ]; @@ -49,8 +49,6 @@ buildPythonPackage rec { zeroconf ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook @@ -61,17 +59,6 @@ buildPythonPackage rec { "tests/test_ip_pairing.py" ]; - disabledTests = [ - # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties' - "test_discover_find_one_unpaired" - "test_find_device_id_case_lower" - "test_find_device_id_case_upper" - "test_discover_missing_csharp" - "test_discover_csharp_case" - "test_discover_device_id_case_lower" - "test_discover_device_id_case_upper" - ]; - pythonImportsCheck = [ "aiohomekit" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index 4727fa2b46a5..97e7f60eadf5 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/wonderslug/aiomodernforms/issues/273 + "test_connection_error" + "test_empty_response" + ]; + pythonImportsCheck = [ "aiomodernforms" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a7d2a5349852..34f6b0d45677 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, bluetooth-data-tools, buildPythonPackage, fetchFromGitHub, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.4.2"; + version = "12.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0="; + hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0="; }; build-system = [ setuptools ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; @@ -48,7 +50,7 @@ buildPythonPackage rec { description = "Python library to control Shelly"; homepage = "https://github.com/home-assistant-libs/aioshelly"; changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 922d60f4c33c..d67a770f18fd 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -47,6 +47,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp compat issues + "test_get_devices" + "test_errors" + "test_async_change_setting" + ]; + pythonImportsCheck = [ "aioskybell" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index e2c08fc5ba7c..08cbff77d200 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "4.3.0"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; rev = "refs/tags/${version}"; - hash = "sha256-NQm3mKjXsv+0xFuRY3w7f4RmMhOjdb8wGVYcXoto8ZE="; + hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index d1719497d7ba..a19d99c2f8ac 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-KaX1TNP6IP2wAijR2y9cqI+Pyc+Ygk3LqKwu5Yrv5LM="; + hash = "sha256-36pMEyLnyl8PS8ZVt+yNdpJGAVpoWTxfTxr+WQw/Go8="; }; pythonRelaxDeps = [ "defusedxml" ]; diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index e0a316317ef3..766e8ff1026a 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "axis"; - version = "62"; + version = "63"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-ey0yt+AIbMO74brHepnCFtekDS4XscTKswshlTrS41A="; + hash = "sha256-XqNzYd7WgSDho3jyCHF1lDZWWpBEZFqGFmVOAUlm50o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index 462a9f1130b4..df170b4e7992 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc="; + hash = "sha256-y2SjnM48OYyXhBxLHE8R9di4ErORUgS87m/FKs21NLU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e75685b74768..cbfea2399312 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.40.6"; + version = "0.42.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys="; + hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index de17cb4106b4..b00a6b5df4ef 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -8,11 +8,12 @@ pytestCheckHook, pythonOlder, setuptools, + propcache, }: buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; rev = "refs/tags/v${version}"; - hash = "sha256-wF5GBQCmKHo3sX4lYA9/wS69x4fFNNh08VG3qMp9UKs="; + hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo="; }; build-system = [ @@ -30,6 +31,8 @@ buildPythonPackage rec { setuptools ]; + dependencies = [ propcache ]; + nativeCheckInputs = [ pytest-cov-stub pytestCheckHook diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 878e560a583b..89358afbf5f0 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.24.2"; + version = "2.24.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-3kgNr7kTKsgjLhxXZddyMs9VjxbWaHqdYYGaHc7NXq0="; + hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 771e615eca46..4c668367fb00 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, defusedxml, fetchFromGitHub, + fetchpatch2, ftfy, httpx, netifaces, @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-/K2pz3B4H205grDeuMWZmEeA4wJqKhP0XdpmbqFguTM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/ol-iver/denonavr/commit/5320aadae91135a8c208c83d82688ddf26eb6498.patch"; + hash = "sha256-F9R5GJ1XK3lHWLY+OgzKu3+xCosK3nX4EII9J1jhlys="; + }) + ]; + pythonRelaxDeps = [ "defusedxml" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index da12ca39dbd0..d88de025c3fe 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "protobuf>=4.22.0" "protobuf" + --replace-fail "protobuf>=4.22.0" "protobuf" ''; nativeBuildInputs = [ setuptools-scm ]; @@ -53,6 +53,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # pytest-httpx compat issue + "test_wrong_password_type" + ]; + pythonImportsCheck = [ "devolo_plc_api" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 66526a2d0975..43a1a1d0e655 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Host '#' cannot contain '#' (at position 0) + "test_client_error" + ]; + pythonImportsCheck = [ "directv" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index b0ae8cfcea08..1c6034c8e2e4 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "3.0.5"; + version = "3.0.8"; pyproject = true; src = fetchFromGitLab { owner = "klikini"; repo = "doorbirdpy"; rev = "refs/tags/${version}"; - hash = "sha256-SVkprX9fMy1uGixsxsE7gbUJndvl+V/kle3Rq34S6Hs="; + hash = "sha256-UayXJhfiiwB2aXCa5V1U/LnNiV7KX4lpIG9hNG6iCm0="; }; build-system = [ setuptools ]; @@ -35,11 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # connection error on mock host - "test_info_auth_fails" - ]; - pythonImportsCheck = [ "doorbirdpy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 9e49e8c420c8..84afd730f495 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -6,23 +6,26 @@ pytestCheckHook, requests, segno, + setuptools, }: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.13.2"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kbr"; - repo = pname; + repo = "fritzconnection"; rev = "refs/tags/${version}"; - hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI="; + hash = "sha256-1LLfSEOKqUIhWIR/RQEG0Bp41d908hAKDlslJlWCHys="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; optional-dependencies = { qr = [ segno ]; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bceb44eb0b6f..0f0f22280579 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, httpx, poetry-core, pytest-asyncio, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-QAnwFX53jf7yWWa308/XTARNw5Qeo9K2zfD+6+HiFuM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/home-assistant-ecosystem/python-glances-api/commit/f193472a25469e7e4b946f9a1c3a7a95949c6c04.patch"; + hash = "sha256-hFeWv2WdbdeoaHgAOmwtBwWwPLjJzyurTZDV98qR7F8="; + }) + ]; + build-system = [ poetry-core ]; dependencies = [ httpx ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 0c2664caa51c..1f4e2ef3cdc4 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "6.1.0"; + version = "6.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE="; + hash = "sha256-X/jiers05zNAEUau6SVKGyyIx9HCs7yI0HsuZ7/tXfo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 980dc0726991..44548561b349 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "habitipy"; - version = "0.3.1"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - # TODO: https://github.com/ASMfreaK/habitipy/issues/27 - rev = "faaca8840575fe8b807bf17acea6266d5ce92a99"; - hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro="; + rev = "refs/tags/v${version}"; + hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index f6deb6625535..fb5757ae114f 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.4.1"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-pJ294WnJjZXYFlezjfNXmUS+ouaZUGPLxUqj2sMQdU0="; + hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M="; }; build-system = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index d814bf89fb3d..bfe31c016bc3 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -8,7 +8,6 @@ ciso8601, cryptography, fetchFromGitHub, - fetchpatch2, pycognito, pyjwt, pytest-aiohttp, @@ -18,21 +17,22 @@ setuptools, snitun, syrupy, + webrtc-models, xmltodict, }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.82.0"; + version = "0.83.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-hRhRXpiIPrI3umOhsVWLwkSwtEfwevC3fNvJElhKy+I="; + hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo="; }; pythonRelaxDeps = [ "acme" ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { pycognito pyjwt snitun + webrtc-models ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix index 310d407fa70a..206f6720f634 100644 --- a/pkgs/development/python-modules/lcn-frontend/default.nix +++ b/pkgs/development/python-modules/lcn-frontend/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lcn-frontend"; - version = "0.1.7"; + version = "0.2.1"; pyproject = true; src = fetchPypi { pname = "lcn_frontend"; inherit version; - hash = "sha256-S/7NUduAiekQ5CDOw8JRCTO9mbvLW6MmB/n8iQQPkok="; + hash = "sha256-GParXVKAbYI8zjBWjf7+uBCpMzLszp2nMxXhJkf4Ln4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 053b922c148b..f84ad7a37a86 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "3.4.1.8.8"; + version = "4.1.1.116.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc="; + hash = "sha256-QVh1MplzUL0LO3gPvxC/5uJjFoK57j2WdT2oMsneIkA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix index 199011b934b1..0a7ad4b872cb 100644 --- a/pkgs/development/python-modules/py-aosmith/default.nix +++ b/pkgs/development/python-modules/py-aosmith/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-aosmith"; - version = "1.0.8"; + version = "1.0.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdr99"; repo = "py-aosmith"; rev = "refs/tags/${version}"; - hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; + hash = "sha256-6wgPj3e3nbv0LM4qgZsj70F4nKy9LmY3RCvs++n1KbE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index f41685c71150..5af9c6561a0d 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,33 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "pybase64"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cU8CHD6qKHwQl87Wjy30xbLs0lBFUcLnHIQ/VDZaygM="; + src = fetchFromGitHub { + owner = "mayeut"; + repo = "pybase64"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; pythonImportsCheck = [ "pybase64" ]; - meta = with lib; { + meta = { description = "Fast Base64 encoding/decoding"; mainProgram = "pybase64"; homepage = "https://github.com/mayeut/pybase64"; - changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; - license = licenses.bsd2; + changelog = "https://github.com/mayeut/pybase64/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.bsd2; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 1ce5d605f020..ec974f24f6e9 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.8"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = "pyfibaro"; rev = "refs/tags/${version}"; - hash = "sha256-gid+qbl4RgT47zC5i1Usw2Zco+jb2LJeeMkKvni/aDM="; + hash = "sha256-7hn5iFuN86sdqLi5MIEwBYLYbPg7J1BbADHYdjYBCNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index 6b316dd72cc7..4076913dc9e5 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.1.1"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 rev = "refs/tags/v${version}"; - hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ="; + hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index e78c7f36d81e..8c04887f758c 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -10,26 +10,21 @@ buildPythonPackage rec { pname = "pysuez"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "ooii"; + owner = "jb101010-2"; repo = "pySuez"; - rev = "refs/tags/v${version}"; - hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + rev = "refs/tags/${version}"; + hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'datetime'" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ regex requests ]; @@ -42,8 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to get water consumption data from Suez"; mainProgram = "pysuez"; - homepage = "https://github.com/ooii/pySuez"; - changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + homepage = "https://github.com/jb101010-2/pySuez"; + changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 7c5b303c70a8..a5da6bc33006 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.50.1"; + version = "0.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-GA5BioH1z8N6I65q+7vSHM/eetN5dXSMZZ2hoQ8+0QA="; + hash = "sha256-Ti+3f6UGn/A9MdLJVUT9hnAiS8Ce6D8FrSryrGxMV6s="; }; build-system = [ setuptools ]; @@ -40,11 +40,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # mismatch in expected data structure - "test_parse_advertisement_data_curtain" - ]; - pythonImportsCheck = [ "switchbot" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index b6312d2c0178..42e9abe85c3b 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -6,9 +6,10 @@ backoff, buildPythonPackage, fetchFromGitHub, + mashumaro, + orjson, packaging, poetry-core, - mashumaro, pytest-asyncio, pytest-cov-stub, pytest-mock, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.6.2"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; rev = "refs/tags/v${version}"; - hash = "sha256-/rdYCd5eyFqW96XaIzQOhsApzcTkrI46Gt226sLTLUQ="; + hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI="; }; postPatch = '' @@ -43,8 +44,9 @@ buildPythonPackage rec { aiohttp async-timeout backoff - packaging mashumaro + orjson + packaging yarl ]; diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index b4626a8d02db..4433e441b6cb 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-homeassistant-analytics"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-homeassistant-analytics"; rev = "refs/tags/v${version}"; - hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; + hash = "sha256-vyJseIYFmbxUYieZB0r3Z3j6/ZHmgs7ONa5YKQTwAXw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 51772d90f942..796b3e601f38 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.5"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs="; + hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 3efb6a31b201..37ccb0932569 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.16"; + version = "0.0.17"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-YjsRjzkYac3IDuAq5s73INELNfWO6EhU5BMM7xQO7pk="; + hash = "sha256-TJ5QWt5bCDy9L4EShf1rW1TDIrF0LfeThEv9PiCPEp8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1b7af821ade9..fe2802278269 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.3"; + version = "0.30.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-4MkREdeYqAA+MpM9JQyiVVDPpefVTNT0x0ptR33K6yU="; + hash = "sha256-kk5i477xLzKePNs1B4lUjKxS4HlA5FCw7pImnESh9Y8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index b749a805eb27..2e3a5f4afbc3 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp 3.10.6 compat + "test_errors" + ]; + pythonImportsCheck = [ "pytomorrowio" ]; meta = { diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 3610c50b3a00..343bcca0a965 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "6.17.0"; + version = "6.4.2"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; rev = "refs/tags/v${version}"; - hash = "sha256-7AHmRAJ8wL8/V5uQyjdsEUxHQz0n+3pxi9FpMsM1l4U="; + hash = "sha256-FbmVQ+nt/WEwE5vRMo2610TO463CT8nCseqB30uXjSM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvicare-neo/default.nix b/pkgs/development/python-modules/pyvicare-neo/default.nix deleted file mode 100644 index 5980fca223f2..000000000000 --- a/pkgs/development/python-modules/pyvicare-neo/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - authlib, - buildPythonPackage, - fetchFromGitHub, - lib, - poetry-core, - pytestCheckHook, - requests, - types-requests, -}: - -buildPythonPackage rec { - pname = "pyvicare-neo"; - version = "0.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "CFenner"; - repo = "PyViCare"; - rev = "refs/tags/v${version}"; - hash = "sha256-QjFrBf58uM5OProKsesyY43MuE1MnIVIVqs5rWUTmes="; - }; - - build-system = [ poetry-core ]; - - propagatedBuildInputs = [ - authlib - requests - types-requests - ]; - - pythonImportsCheck = [ "PyViCare" ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - changelog = "https://github.com/CFenner/PyViCare/releases/tag/v${version}"; - description = "Library to communicate with the Viessmann ViCare API"; - homepage = "https://github.com/CFenner/PyViCare"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix new file mode 100644 index 000000000000..2d60fc3af1f2 --- /dev/null +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -0,0 +1,51 @@ +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + requests, + pytest-cov-stub, + pytestCheckHook, + simplejson, +}: + +buildPythonPackage rec { + pname = "pyvicare"; + version = "2.35.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openviess"; + repo = "PyViCare"; + rev = "refs/tags/${version}"; + hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.1.0"' 'version = "${version}"' + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + authlib + requests + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "PyViCare" ]; + + meta = with lib; { + changelog = "https://github.com/openviess/PyViCare/releases/tag/${version}"; + description = "Python Library to access Viessmann ViCare API"; + homepage = "https://github.com/somm15/PyViCare"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0fdeac33b67f..a42a2b432e6a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-qyz5i4379OelXI+uQwhpeuE4/1mZhPrNnxZ3KAD7JWs="; + hash = "sha256-7dRwZKthEAtVvOsKUXgkCE5zwUtcJgSJZiaHXJwZ+9w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index 53be565a94ee..de088932713e 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.2"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-GSUIotR1uB+KjuVIjsJIIaUFfg9gJ8aIYm+aR8iJT9Y="; + hash = "sha256-6OX9awRmy2DT8SHvoVsLcsZ6LxTek/HgXNG9b2wSfGU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index 8677ae389af6..b5ce22702ae0 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # yarl compat issue https://github.com/jrester/tesla_powerwall/issues/68 + "test_parse_endpoint" + ]; + pytestFlagsArray = [ "tests/unit" ]; pythonImportsCheck = [ "tesla_powerwall" ]; diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix new file mode 100644 index 000000000000..1154f0380442 --- /dev/null +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, +}: + +buildPythonPackage rec { + pname = "teslemetry-stream"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Teslemetry"; + repo = "python-teslemetry-stream"; + rev = "v${version}"; + hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "teslemetry_stream" ]; + + meta = { + changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v${version}"; + description = "Python library for the Teslemetry Streaming API"; + homepage = "https://github.com/Teslemetry/python-teslemetry-stream"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix index ec85761f7d05..657eac221a47 100644 --- a/pkgs/development/python-modules/thinqconnect/default.nix +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thinqconnect"; - version = "0.9.9"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thinq-connect"; repo = "pythinqconnect"; rev = "refs/tags/${version}"; - hash = "sha256-G6fg+mXrUnSkfpeJAvDXEu57UgkYEObErEnds2PK13Y="; + hash = "sha256-8TDpoV2FNWzcHwXaEDyt5mRCbmFdtfuIYJK7OqXAgvg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index b09942f1beec..025eec125099 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -14,6 +14,7 @@ coloredlogs, crc, libgpiod, + pyserial-asyncio-fast, typing-extensions, zigpy, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.22"; + version = "0.0.25"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-fAz5dhHO5A0pSH6IYcVwNWPxqsNn3urXqnp8GudOrBA="; + hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { click coloredlogs crc + pyserial-asyncio-fast typing-extensions zigpy ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ]; diff --git a/pkgs/development/python-modules/webexpythonsdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix new file mode 100644 index 000000000000..fb14d7ab164c --- /dev/null +++ b/pkgs/development/python-modules/webexpythonsdk/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyjwt, + pythonOlder, + requests, + requests-toolbelt, + poetry-core, + poetry-dynamic-versioning, +}: + +buildPythonPackage rec { + pname = "webexpythonsdk"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "CiscoDevNet"; + repo = "WebexPythonSDK"; + rev = "refs/tags/v${version}"; + hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + pyjwt + requests + requests-toolbelt + ]; + + # Tests require a Webex Teams test domain + doCheck = false; + + pythonImportsCheck = [ "webexpythonsdk" ]; + + meta = with lib; { + description = "Python module for Webex Teams APIs"; + homepage = "https://github.com/WebexCommunity/WebexPythonSDK"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 373f06b6d046..30eeb64d83a1 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -2,34 +2,41 @@ lib, buildPythonPackage, fetchFromGitHub, + future, pyjwt, pythonOlder, requests, requests-toolbelt, - poetry-core, - poetry-dynamic-versioning, + setuptools, + versioneer, }: buildPythonPackage rec { pname = "webexteamssdk"; - version = "2.0.1"; + version = "1.6.1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CiscoDevNet"; repo = "webexteamssdk"; rev = "refs/tags/v${version}"; - hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + build-system = [ - poetry-core - poetry-dynamic-versioning + setuptools + versioneer ]; dependencies = [ + future pyjwt requests requests-toolbelt @@ -38,13 +45,13 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ "webexpythonsdk" ]; + pythonImportsCheck = [ "webexteamssdk" ]; meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; - license = licenses.mit; + license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index b06ccc46b0ad..e9910213140e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.135.0"; + version = "0.136.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-3zUY9zOmC2avR7rO5O22lqqEY5ql612fRutbGl7SYKs="; + hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4="; }; build-system = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 05040663a579..8946613f81b9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.122"; + version = "0.0.124"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-/xxMcZPwIL76F+E3Rp0/VtzFOrk7e4i1knf/OIAf+48="; + hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 1847b2c49d8e..2da990de3650 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.34"; + version = "0.0.37"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-or4mZpfcVl7fTf8O1vBxEeeJvhYNgrlV+FClrzQG/lg="; + hash = "sha256-PY4TJIG5NtJdQuQYmoZG3NgcH3WfCkpkcoJTbJ5jdr0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 04b8efb6f27f..edbba6c73050 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pyserial, pyserial-asyncio, pytest-asyncio, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.3"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,20 +22,13 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k="; + hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/zigpy/zigpy-deconz/commit/86fdcd6be824f12ce3bf88b40217a6224cbf5a89.patch"; - hash = "sha256-iqpTSJPBMSBZXg5EVXXupxIFRsGCNuxU/oNHZ2VT0Jc="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail ', "setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 0a3c11635f48..449632991f89 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-d5TOX2sKA2E6b6KHvAdhxEknD6fOF4qRjCMpBKEsicA="; + hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index fc7d291bd2a9..a48feefb0730 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-Mwccb0OQgSknH8prbFejkGRVI7ii/r9D87aRyQrGgWs="; + hash = "sha256-MlAX7dcRZziMYCpG64OemZ8czwvDXpdoRaDVo1sUCno="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 98a7661f0483..628a688f0875 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.12.4"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4="; + hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9edb65707b9f..f20c1a004406 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.67.0"; + version = "0.71.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-06RKvKOXMhq6LwKSk451cR7EUW+78AZzWsrqSMgq02E="; + hash = "sha256-ctlbCtUiwLFlxja9F6Fz7m9FP/lJLS+7/+gWlMTo+1s="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 07cc7ecb0e62..f72064a46c0f 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.4"; + version = "2024.11.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -145,6 +145,7 @@ asmog ]; "analytics" = ps: with ps; [ + aiohasupervisor fnv-hash-fast psutil-home-assistant sqlalchemy @@ -273,6 +274,7 @@ asyncarve ]; "arwn" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "aseko_pool_live" = ps: with ps; [ @@ -345,6 +347,7 @@ botocore ]; "axis" = ps: with ps; [ + aiohasupervisor axis paho-mqtt_1 ]; @@ -404,8 +407,6 @@ ]; "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api - "bloomsky" = ps: with ps; [ - ]; "blue_current" = ps: with ps; [ bluecurrent-api ]; @@ -605,6 +606,7 @@ py-canary ]; "cast" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -638,6 +640,9 @@ "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; + "cisco_webex_teams" = ps: with ps; [ + webexpythonsdk + ]; "citybikes" = ps: with ps; [ ]; "clementine" = ps: with ps; [ @@ -651,6 +656,7 @@ "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -782,6 +788,7 @@ cached-ipaddress dbus-fast fnv-hash-fast + go2rtc-client ha-ffmpeg habluetooth hass-nabucasa @@ -936,6 +943,7 @@ dremel3dpy ]; "drop_connect" = ps: with ps; [ + aiohasupervisor dropmqttapi paho-mqtt_1 ]; @@ -943,6 +951,7 @@ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "dte_energy_bridge" = ps: with ps; [ @@ -1353,7 +1362,7 @@ forecast-solar ]; "forked_daapd" = ps: with ps; [ - spotipy + spotifyaio ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi @@ -1404,6 +1413,7 @@ ayla-iot-unofficial ]; "fully_kiosk" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 python-fullykiosk ]; @@ -1497,6 +1507,10 @@ "glances" = ps: with ps; [ glances-api ]; + "go2rtc" = ps: with ps; [ + go2rtc-client + pyturbojpeg + ]; "goalzero" = ps: with ps; [ goalzero ]; @@ -1512,6 +1526,7 @@ oauth2client ]; "google_assistant" = ps: with ps; [ + aiohasupervisor python-matter-server pyturbojpeg ]; @@ -1522,8 +1537,6 @@ google-cloud-speech google-cloud-texttospeech ]; - "google_domains" = ps: with ps; [ - ]; "google_generative_ai_conversation" = ps: with ps; [ google-generativeai ha-ffmpeg @@ -1701,6 +1714,7 @@ "homeassistant" = ps: with ps; [ ]; "homeassistant_alerts" = ps: with ps; [ + aiohasupervisor ]; "homeassistant_green" = ps: with ps; [ aiohasupervisor @@ -1820,6 +1834,31 @@ "husqvarna_automower" = ps: with ps; [ aioautomower ]; + "husqvarna_automower_ble" = ps: with ps; [ + aioesphomeapi + aioruuvigateway + aioshelly + automower-ble + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + pymicro-vad + pyserial + pyspeex-noise + pyudev + zeroconf + ]; "huum" = ps: with ps; [ huum ]; @@ -2042,6 +2081,7 @@ ]; # missing inputs: pyirishrail "iron_os" = ps: with ps; [ aioesphomeapi + aiogithubapi aioruuvigateway aioshelly bleak @@ -2379,6 +2419,9 @@ "lg_soundbar" = ps: with ps; [ temescal ]; + "lg_thinq" = ps: with ps; [ + thinqconnect + ]; "lidarr" = ps: with ps; [ aiopyarr ]; @@ -2462,6 +2505,7 @@ aiolookin ]; "loqed" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -2510,12 +2554,8 @@ "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ - paho-mqtt_1 - ]; - "map" = ps: with ps; [ aiohasupervisor - home-assistant-frontend - pillow + paho-mqtt_1 ]; "marantz" = ps: with ps; [ ]; @@ -2531,6 +2571,7 @@ pillow ]; "matter" = ps: with ps; [ + aiohasupervisor python-matter-server ]; "maxcube" = ps: with ps; [ @@ -2570,7 +2611,8 @@ ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ yt-dlp - ]; + ] + ++ yt-dlp.optional-dependencies.default; "media_player" = ps: with ps; [ ]; "media_source" = ps: with ps; [ @@ -2695,6 +2737,7 @@ zeroconf ]; "mobile_app" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -2799,18 +2842,23 @@ mpd2 ]; "mqtt" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_eventstream" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_json" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_room" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "mqtt_statestream" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "msteams" = ps: with ps; [ @@ -2830,6 +2878,7 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 pymysensors ]; @@ -2868,6 +2917,7 @@ ha-ffmpeg ]; "netatmo" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3158,6 +3208,7 @@ ovoenergy ]; "owntracks" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3173,6 +3224,8 @@ "p1_monitor" = ps: with ps; [ p1monitor ]; + "palazzetti" = ps: with ps; [ + ]; # missing inputs: pypalazzetti "panasonic_bluray" = ps: with ps; [ panacotta ]; @@ -3187,11 +3240,6 @@ home-assistant-frontend pillow ]; - "panel_iframe" = ps: with ps; [ - aiohasupervisor - home-assistant-frontend - pillow - ]; "pcs_lighting" = ps: with ps; [ ]; "peco" = ps: with ps; [ @@ -3242,6 +3290,7 @@ "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3429,6 +3478,7 @@ zeroconf ]; "rachio" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3444,6 +3494,7 @@ aiopyarr ]; "radio_browser" = ps: with ps; [ + pycountry radios ]; "radiotherm" = ps: with ps; [ @@ -3948,6 +3999,7 @@ "smarther" = ps: with ps; [ ]; "smartthings" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3982,6 +4034,7 @@ snapcast ]; "snips" = ps: with ps; [ + aiohasupervisor paho-mqtt_1 ]; "snmp" = ps: with ps; [ @@ -4046,7 +4099,7 @@ plexwebsocket soco sonos-websocket - spotipy + spotifyaio zeroconf ]; "sony_projector" = ps: with ps; [ @@ -4064,13 +4117,12 @@ speedtest-cli ]; "spider" = ps: with ps; [ - spiderpy ]; "splunk" = ps: with ps; [ hass-splunk ]; "spotify" = ps: with ps; [ - spotipy + spotifyaio ]; "sql" = ps: with ps; [ sqlalchemy @@ -4253,6 +4305,7 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ + aiohasupervisor hatasmota paho-mqtt_1 ]; @@ -4304,6 +4357,7 @@ ]; "teslemetry" = ps: with ps; [ tesla-fleet-api + teslemetry-stream ]; "tessie" = ps: with ps; [ tesla-fleet-api @@ -4440,6 +4494,7 @@ pytomorrowio ]; "toon" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -4650,7 +4705,7 @@ "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ - pyvicare-neo + pyvicare ]; "vilfo" = ps: with ps; [ vilfo-api-client @@ -4766,6 +4821,7 @@ "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ + aiohasupervisor aiowithings ha-ffmpeg hass-nabucasa @@ -4865,6 +4921,7 @@ "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -4987,6 +5044,7 @@ zm-py ]; "zwave_js" = ps: with ps; [ + aiohasupervisor pyserial pyudev zwave-js-server-python @@ -5268,6 +5326,7 @@ "gios" "github" "glances" + "go2rtc" "goalzero" "gogogate2" "goodwe" @@ -5275,7 +5334,6 @@ "google_assistant" "google_assistant_sdk" "google_cloud" - "google_domains" "google_generative_ai_conversation" "google_mail" "google_photos" @@ -5332,6 +5390,7 @@ "humidifier" "hunterdouglas_powerview" "husqvarna_automower" + "husqvarna_automower_ble" "huum" "hvv_departures" "hydrawise" @@ -5408,6 +5467,7 @@ "lektrico" "lg_netcast" "lg_soundbar" + "lg_thinq" "lidarr" "life360" "lifx" @@ -5439,7 +5499,6 @@ "mailgun" "manual" "manual_mqtt" - "map" "mastodon" "matrix" "matter" @@ -5558,7 +5617,6 @@ "p1_monitor" "panasonic_viera" "panel_custom" - "panel_iframe" "peco" "pegel_online" "permobil" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0b56bf3763b0..915f4bf10287 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -161,6 +161,15 @@ let doCheck = false; # no tests }); + plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec { + version = "1.4.4"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-dlDytOSp/7npanxXH5uaDv29AP21UciEzIzDlMf6jf8="; + }; + }); + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -226,6 +235,15 @@ let }; }); + pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { + version = "3.6.9"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; + }; + }); + pyoctoprintapi = super.pyoctoprintapi.overridePythonAttrs (oldAttrs: rec { version = "0.1.12"; src = fetchFromGitHub { @@ -335,6 +353,15 @@ let ]; }; + voip-utils = super.voip-utils.overridePythonAttrs (oldAttrs: rec { + version = "0.1.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; + }; + }); + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -403,7 +430,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.4"; + hassVersion = "2024.11.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -421,13 +448,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-uaGGt5qCdyFXuEtg20MzmFd4PXkdPP8h4HJBvRV6sz8="; + hash = "sha256-9wFF0tDy3IAnmjjP1juQsU2G6qmQiBnBX1imNrbib7Y="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-al45WS8SIgOM2TqGPIptZU7iNMapYUg+fK2MLh68lxs="; + hash = "sha256-9DtxrMhozse672aa1pHvk/wOpr7GdWUZtz0u7GNGBVw="; }; build-system = with python.pkgs; [ @@ -474,12 +501,9 @@ in python.pkgs.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace tests/test_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" - - substituteInPlace pyproject.toml --replace-fail "wheel~=0.43.0" wheel + substituteInPlace tests/test_core_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\"" sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml - sed -i 's/wheel[~=]/wheel>/' pyproject.toml ''; dependencies = with python.pkgs; [ @@ -509,6 +533,7 @@ in python.pkgs.buildPythonApplication rec { orjson packaging pillow + propcache psutil-home-assistant pyjwt pyopenssl diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bb9cc204bf59..1ee12aaf46f3 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.4"; + version = "20241106.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-b1/VrN0r/7rvSCjSn9HugKLaA40yl4AsFugzmCZKzd8="; + hash = "sha256-EqF3fgT7pMjYTMVFcoXXnbeGjT7ZevmmTCqG8q3Qqt4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index a7360dd7e2e5..57598ad2b0f5 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.10.2"; + version = "2024.11.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-bVKsZvQ4JhVpwILkRR/+lUzchBGwG2D4TTdBD7lDRcY="; + hash = "sha256-6SgvRaiPOfXM5OxrBQ/w600k7E+AKZEB8vukic6M4lA="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 499b4b823ea8..fefbf501f1d2 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.172"; + version = "0.13.180"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-azTnNgbdj7AMBLTz+y5BLeQDKUqA5wkxFMG3g30f6wo="; + hash = "sha256-OLCGoZ5C39D4yYJagowO914qJlQcJVScm/a1ZbR2alM="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index efd82a902f22..44cff2d2d7ba 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.4"; + version = "2024.11.0"; 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-MjHqX1OP1mEEypAxZ8Xc+ZWBsfj4yiFG9oItFnf/svk="; + hash = "sha256-ktKmYr5wzrmZoedK2FB1qFcqt3NGKzXcL7f1j2/K6vc="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 4f1ae7204fad..a9d12c4e43cb 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -8,10 +8,12 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { axis = getComponentDeps "deconz"; + gardena_bluetooth = getComponentDeps "husqvarna_automower_ble"; govee_ble = [ ibeacon-ble ]; hassio = getComponentDeps "homeassistant_yellow"; + husqvarna_automower_ble = getComponentDeps "gardena_bluetooth"; lovelace = [ pychromecast ]; @@ -35,6 +37,7 @@ let system_log = [ isal ]; + tesla_fleet = getComponentDeps "teslemetry"; xiaomi_miio = [ arrow ]; @@ -69,6 +72,10 @@ let # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ]; + honeywell = [ + # Failed: Unused ignore translations: component.honeywell.config.abort.reauth_successful. Please remove them from the ignore_translations fixture. + "--deselect=tests/components/honeywell/test_config_flow.py::test_reauth_flow" + ]; jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" @@ -76,10 +83,18 @@ let # AssertionError: assert [+ received] == [- snapshot] "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; + jewish_calendar = [ + # Failed: Unused ignore translations: component.jewish_calendar.config.abort.reconfigure_successful. Please remove them from the ignore_translations fixture. + "--deselect tests/components/jewish_calendar/test_config_flow.py::test_reconfigure" + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + nina = [ + # Failed: Unused ignore translations: component.nina.options.error.unknown. Please remove them from the ignore_translations fixture. + "--deselect tests/components/nina/test_config_flow.py::test_options_flow_unexpected_exception" + ]; sql = [ "-W" "ignore::sqlalchemy.exc.SAWarning" diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 1c68331d1c1c..5d8dbacd91bc 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -45,6 +45,7 @@ PKG_PREFERENCES = { "numpy": "numpy_1", "ollama-hass": "ollama", "paho-mqtt": "paho-mqtt_1", + "pysuezV2": "pysuez", "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f95a421d109f..d33cb84c62c2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -548,8 +548,8 @@ mapAliases ({ pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 + pyvicare-neo = pyvicare; # Added 2024-11-06 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 - pyvicare = pyvicare-neo; # added 2024-08-31 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e31ff8139b6a..453d627ff5ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13213,7 +13213,7 @@ self: super: with self; { pyvex = callPackage ../development/python-modules/pyvex { }; - pyvicare-neo = callPackage ../development/python-modules/pyvicare-neo { }; + pyvicare = callPackage ../development/python-modules/pyvicare { }; pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; @@ -15638,6 +15638,8 @@ self: super: with self; { teslajsonpy = callPackage ../development/python-modules/teslajsonpy { }; + teslemetry-stream = callPackage ../development/python-modules/teslemetry-stream { }; + tess = callPackage ../development/python-modules/tess { }; tesserocr = callPackage ../development/python-modules/tesserocr { }; @@ -17580,6 +17582,8 @@ self: super: with self; { webencodings = callPackage ../development/python-modules/webencodings { }; + webexpythonsdk = callPackage ../development/python-modules/webexpythonsdk { }; + webexteamssdk = callPackage ../development/python-modules/webexteamssdk { }; webmin-xmlrpc = callPackage ../development/python-modules/webmin-xmlrpc { };