From 2c08f884092a0c3679a4007bc27a595e23dd2119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Mar 2024 09:17:43 -0800 Subject: [PATCH 1/2] python311Packages.systembridgeconnector: fix version in wheel --- .../python-modules/systembridgeconnector/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix index 111517c6ca5e..b21c1be499fe 100644 --- a/pkgs/development/python-modules/systembridgeconnector/default.nix +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch2 , setuptools , aiohttp , incremental @@ -22,6 +23,13 @@ buildPythonPackage rec { hash = "sha256-AjdWDEotz5AUo+auxBqXu7EMv/Kt97DZ6vOrFunZ2Fw="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/timmo001/system-bridge-connector/commit/a9030cf175ab4b51d77010de89e83cbb426448c2.patch"; + hash = "sha256-0N8knoaEvymSvC92BxDKR0j52oasvOzWosFtHMI2Qmc="; + }) + ]; + nativeBuildInputs = [ setuptools ]; From fbeaed901b352d68af3e4d1d53853317aec06fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Mar 2024 09:22:20 -0800 Subject: [PATCH 2/2] python311Packages.systembridgeconnector: run tests --- .../systembridgeconnector/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix index b21c1be499fe..f5bb1e63136b 100644 --- a/pkgs/development/python-modules/systembridgeconnector/default.nix +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -7,6 +7,9 @@ , aiohttp , incremental , systembridgemodels +, pytest-aiohttp +, pytest-socket +, pytestCheckHook }: buildPythonPackage rec { @@ -28,6 +31,10 @@ buildPythonPackage rec { url = "https://github.com/timmo001/system-bridge-connector/commit/a9030cf175ab4b51d77010de89e83cbb426448c2.patch"; hash = "sha256-0N8knoaEvymSvC92BxDKR0j52oasvOzWosFtHMI2Qmc="; }) + (fetchpatch2 { + url = "https://github.com/timmo001/system-bridge-connector/commit/25aa172775ee983dc4a29b8dda880aefbad70040.patch"; + hash = "sha256-PedW1S1gZmWkS4sJBqSAx3aoA1KppYS5Xlhoaxqkcd4="; + }) ]; nativeBuildInputs = [ @@ -42,8 +49,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "systembridgeconnector" ]; - # upstream has no tests - doCheck = false; + nativeCheckInputs = [ + pytest-aiohttp + pytest-socket + pytestCheckHook + ]; + + disabledTests = [ + # ConnectionClosedException: Connection closed to server + "test_get_files" + ]; meta = { changelog = "https://github.com/timmo001/system-bridge-connector/releases/tag/${version}";