From ce0a397880466cf74b7d50fbe99aa7c53c8fb40f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Feb 2024 14:45:58 +0100 Subject: [PATCH 1/2] python312Packages.oralb-ble: 0.17.6 -> 0.18.0 Diff: https://github.com/Bluetooth-Devices/oralb-ble/compare/refs/tags/v0.17.6...v0.18.0 Changelog: https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v0.18.0 --- pkgs/development/python-modules/oralb-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 5eb5d0ce83fe..369156b46bf0 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.6"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6LnZ+Y68sl0uA5i764n4fFJnPeo+bAi/xgEvTK6LkXY="; + hash = "sha256-e6L8HXpqOAHnEktIJ1N1atC5QXno669W3c/S7cISa48="; }; nativeBuildInputs = [ From 5ae56eac276165331acfb4eb5330b7a78429c73b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Feb 2024 14:51:19 +0100 Subject: [PATCH 2/2] python312Packages.oralb-ble: refactor --- .../python-modules/oralb-ble/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 369156b46bf0..08b0abb2ded8 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -1,4 +1,5 @@ { lib +, bleak , bleak-retry-connector , bluetooth-data-tools , bluetooth-sensor-state-data @@ -6,6 +7,7 @@ , fetchFromGitHub , home-assistant-bluetooth , poetry-core +, pytest-asyncio , pytestCheckHook , pythonOlder }: @@ -13,22 +15,28 @@ buildPythonPackage rec { pname = "oralb-ble"; version = "0.18.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "oralb-ble"; rev = "refs/tags/v${version}"; hash = "sha256-e6L8HXpqOAHnEktIJ1N1atC5QXno669W3c/S7cISa48="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + bleak bleak-retry-connector bluetooth-data-tools bluetooth-sensor-state-data @@ -36,18 +44,19 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "oralb_ble" ]; + disabledTests = [ + # Test is outdated, TypeError: BLEDevice.__init__() missing 2 required... + "test_async_poll" + ]; + meta = with lib; { description = "Library for Oral B BLE devices"; homepage = "https://github.com/Bluetooth-Devices/oralb-ble";