From 98f26c237d23e9ba34524918bb9a25ec93c34ce4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:31:27 +0100 Subject: [PATCH 1/5] python3Packages.justbackoff: init at 0.6.0 --- .../python-modules/justbackoff/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/justbackoff/default.nix diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix new file mode 100644 index 000000000000..814d1d3e53f3 --- /dev/null +++ b/pkgs/development/python-modules/justbackoff/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "justbackoff"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alexferl"; + repo = pname; + rev = "v${version}"; + sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + + pythonImportsCheck = [ + "justbackoff" + ]; + + meta = with lib; { + description = "Simple backoff algorithm in Python"; + homepage = "https://github.com/alexferl/justbackoff"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7b7e9017fac..7e956f79d55f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4093,6 +4093,8 @@ in { jupytext = callPackage ../development/python-modules/jupytext { }; + justbackoff = callPackage ../development/python-modules/justbackoff { }; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; jxmlease = callPackage ../development/python-modules/jxmlease { }; From 9d830c1496e8700c895db56120b39e83d68bbc4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:40:09 +0100 Subject: [PATCH 2/5] python3Packages.nessclient: init at 0.9.16b2 --- .../python-modules/nessclient/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/nessclient/default.nix diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix new file mode 100644 index 000000000000..c21ef192bec9 --- /dev/null +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, justbackoff +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nessclient"; + version = "0.9.16b2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nickw444"; + repo = pname; + rev = version; + sha256 = "1g3q9bv1nn1b8n6bklc05k8pac4cndzfxfr7liky0gnnbri15k81"; + }; + + propagatedBuildInputs = [ + justbackoff + click + ]; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "nessclient" + ]; + + meta = with lib; { + description = "Python implementation/abstraction of the Ness D8x / D16x Serial Interface ASCII protocol"; + homepage = "https://github.com/nickw444/nessclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e956f79d55f..ca1ac9120b36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5054,6 +5054,8 @@ in { neo = callPackage ../development/python-modules/neo { }; + nessclient = callPackage ../development/python-modules/nessclient { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; nestedtext = callPackage ../development/python-modules/nestedtext { }; From ed52654c891d351fb7766a4b40c14d472b9c4a8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:43:32 +0100 Subject: [PATCH 3/5] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 37b078adefa1..b856c3fb098d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -559,7 +559,7 @@ "nanoleaf" = ps: with ps; [ aionanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; - "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient + "ness_alarm" = ps: with ps; [ nessclient ]; "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ netdata ]; From 111b9e563033bd8a83ebe1d16d7cca512f9eaa94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:44:23 +0100 Subject: [PATCH 4/5] home-assistant: enable ness_alarm tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 59d2ee364b23..2a21f5d4ceca 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -535,6 +535,7 @@ in with py.pkgs; buildPythonApplication rec { "nam" "namecheapdns" "neato" + "ness_alarm" "netatmo" "nexia" "no_ip" From 6ba4962a152132e41e8ae13c0e334f8a799ca5a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 13:13:49 +0100 Subject: [PATCH 5/5] python3Packages.nessclient: enable tests --- .../python-modules/nessclient/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix index c21ef192bec9..d91a80eb9d0f 100644 --- a/pkgs/development/python-modules/nessclient/default.nix +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -1,9 +1,12 @@ { lib +, asynctest , buildPythonPackage , click , fetchFromGitHub , justbackoff , pythonOlder +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { @@ -25,15 +28,18 @@ buildPythonPackage rec { click ]; - # Tests are not shipped - doCheck = false; + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "nessclient" ]; meta = with lib; { - description = "Python implementation/abstraction of the Ness D8x / D16x Serial Interface ASCII protocol"; + description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; homepage = "https://github.com/nickw444/nessclient"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ];