diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 076bfe9388a8..d5ea3c88bdc2 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.48.2"; + version = "0.49.0"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; tag = version; - hash = "sha256-igv/F65oZKYj8hd9KCYlbz6Yf9Ny1lnW4yFs0XT4waQ="; + hash = "sha256-haWej3ZcUPd9Rpqf2PH8r0useylnLDaPiSctrwLz71Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/looptime/default.nix b/pkgs/development/python-modules/looptime/default.nix new file mode 100644 index 000000000000..6cbe673d6ba6 --- /dev/null +++ b/pkgs/development/python-modules/looptime/default.nix @@ -0,0 +1,44 @@ +{ + async-timeout, + buildPythonPackage, + fetchFromGitHub, + lib, + pytest-asyncio, + pytestCheckHook, + setuptools, + setuptools-scm, +}: + +buildPythonPackage (finalAttrs: { + pname = "looptime"; + version = "0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nolar"; + repo = "looptime"; + tag = finalAttrs.version; + hash = "sha256-nQNGE/o5QNAw4OSs+O5oWiq+JX+ShV6njOHkn1IlvtE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + pythonImportsCheck = [ "looptime" ]; + + nativeCheckInputs = [ + async-timeout + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/nolar/looptime/releases/tag/${finalAttrs.src.tag}"; + description = "Time dilation & contraction in asyncio event loops (in tests)"; + homepage = "https://github.com/nolar/looptime"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix index 99940e26d627..f8a1c4c8c780 100644 --- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, @@ -19,6 +20,9 @@ buildPythonPackage rec { version = "0.16"; pyproject = true; + # https://github.com/home-assistant-libs/pyserial-asyncio-fast/pull/37 + disabled = pythonAtLeast "3.14"; + src = fetchFromGitHub { owner = "bdraco"; repo = "pyserial-asyncio-fast"; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 85bd1b89ebe1..87e8dd36d8d3 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.150"; + version = "0.0.151"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-kdbmg4SGMl3RYdPFLJhbUxfdMokQ/LrhG6hTlu8eujo="; + hash = "sha256-eB4Xmkbueig9UgGs0d9WLGFLQ20XiCdFtI4KKa8frJw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 845e02c55a04..bc3b4de08497 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, freezegun, + looptime, pyserial, pyserial-asyncio-fast, pytest-asyncio_0, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.81"; + version = "0.0.83"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-MsuCzb2jIjZh24tXUz0fE9MgstuvmUOIWEC0s1jRoow="; + hash = "sha256-/poB5dkD5bta/GWOah6+bz+w++C1NWf649TUzqvDfU0="; }; postPatch = '' @@ -58,6 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + looptime pytest-asyncio_0 pytest-timeout pytest-xdist diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index b6975018854a..d8c427ed4cda 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -10,6 +10,7 @@ crccheck, cryptography, fetchFromGitHub, + filelock, freezegun, frozendict, jsonschema, @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.88.0"; + version = "0.90.0"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-jYhanzekQIIBSqoB/8sToKOhAS/Cicx5OJ83XxWTp7E="; + hash = "sha256-HTQ9azIXnNkNM+s7w0oerDf9+RcCO8DF9+kL9Uzevyk="; }; postPatch = '' @@ -59,6 +60,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses + filelock freezegun pytest-asyncio_0 pytest-timeout @@ -68,13 +70,11 @@ buildPythonPackage rec { disabledTests = [ # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False "test_quirks_v2" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ - "test_periodic_scan_priority" ]; disabledTestPaths = [ # Tests require network access + "tests/ota/test_ota_image.py" "tests/ota/test_ota_providers.py" # All tests fail to shutdown thread during teardown "tests/ota/test_ota_matching.py" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9be3343e7e7f..ad35132d2799 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9100,6 +9100,8 @@ self: super: with self; { loompy = callPackage ../development/python-modules/loompy { }; + looptime = callPackage ../development/python-modules/looptime { }; + loopy = callPackage ../development/python-modules/loopy { }; looseversion = callPackage ../development/python-modules/looseversion { };