From 7d1bcb47dbcfff3c2246a80fac863f2eccbbbbd6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 09:25:26 +0200 Subject: [PATCH 1/6] python312Packages.homeassistant-bring-api: rename to bring-api --- .../{homeassistant-bring-api => bring-api}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{homeassistant-bring-api => bring-api}/default.nix (100%) diff --git a/pkgs/development/python-modules/homeassistant-bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix similarity index 100% rename from pkgs/development/python-modules/homeassistant-bring-api/default.nix rename to pkgs/development/python-modules/bring-api/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d6f6e358a7b9..00573f5cc226 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -208,6 +208,7 @@ mapAliases ({ hcs_utils = hcs-utils; # added 2024-01-06 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hglib = python-hglib; # added 2023-10-13 + homeassistant-bring-api = bring-api; # added 2024-04-11 homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05 HTSeq = htseq; # added 2023-02-19 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9a6001945e9..2226189c0815 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1730,6 +1730,8 @@ self: super: with self; { brian2 = callPackage ../development/python-modules/brian2 { }; + bring-api = callPackage ../development/python-modules/bring-api { }; + broadbean = callPackage ../development/python-modules/broadbean { }; broadlink = callPackage ../development/python-modules/broadlink { }; @@ -5379,8 +5381,6 @@ self: super: with self; { home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { }; - homeassistant-bring-api = callPackage ../development/python-modules/homeassistant-bring-api { }; - home-assistant-chip-clusters = callPackage ../development/python-modules/home-assistant-chip-clusters { }; home-assistant-chip-core = callPackage ../development/python-modules/home-assistant-chip-core { }; From c29d1a5cba6ce7dd19965bdb0b713c7acd080a50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 09:27:47 +0200 Subject: [PATCH 2/6] python312Packages.bring-api: rename, update URLs, etc. --- .../development/python-modules/bring-api/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 2912e26f5c80..466ab568728b 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "homeassistant-bring-api"; + pname = "bring-api"; version = "0.5.6"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miaucl"; - repo = "homeassistant-bring-api"; + repo = "bring-api"; rev = "refs/tags/${version}"; hash = "sha256-vfc4xKLeGF2FuBFwqU99qbkUDBK5Uz66S4F2ODRDPa8="; }; @@ -32,13 +32,13 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ - "homeassistant_bring_api" + "bring_api" ]; meta = with lib; { - description = "Module to access the Bring! shopping lists API with Home Assistant"; - homepage = "https://github.com/miaucl/homeassistant-bring-api"; - changelog = "https://github.com/miaucl/homeassistant-bring-api/blob/${version}/CHANGELOG.md"; + description = "Module to access the Bring! shopping lists API"; + homepage = "https://github.com/miaucl/bring-api"; + changelog = "https://github.com/miaucl/bring-api/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From b14303fcceb714c5d9dc8cb9732caeda51fa93f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 09:29:21 +0200 Subject: [PATCH 3/6] python312Packages.bring-api: 0.5.6 -> 0.7.0 Diff: https://github.com/miaucl/bring-api/compare/refs/tags/0.5.6...0.7.0 Changelog: https://github.com/miaucl/bring-api/blob/0.7.0/CHANGELOG.md --- pkgs/development/python-modules/bring-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 466ab568728b..fcf3eddfb9e0 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.5.6"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-vfc4xKLeGF2FuBFwqU99qbkUDBK5Uz66S4F2ODRDPa8="; + hash = "sha256-fhZMn0v908VzV+JLuS8tM+BPKJBoj77vEh1pINL4Cco="; }; nativeBuildInputs = [ From 54f7f1fe10c99d50ec360cfea0be746ef30b7021 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 09:32:43 +0200 Subject: [PATCH 4/6] python312Packages.bring-api: refactor - enable tests --- .../python-modules/bring-api/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index fcf3eddfb9e0..49cf42c8ab39 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -1,9 +1,13 @@ { lib , aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub -, setuptools +, pytest-asyncio +, pytestCheckHook +, python-dotenv , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -20,16 +24,20 @@ buildPythonPackage rec { hash = "sha256-fhZMn0v908VzV+JLuS8tM+BPKJBoj77vEh1pINL4Cco="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + python-dotenv + ]; pythonImportsCheck = [ "bring_api" From 156e0d08127569e8ba4b8cebdc3aa749fe00336d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 09:33:35 +0200 Subject: [PATCH 5/6] python312Packages.bring-api: format with nixfmt --- .../python-modules/bring-api/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 49cf42c8ab39..720d06e55560 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -1,13 +1,14 @@ -{ lib -, aiohttp -, aioresponses -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, python-dotenv -, pythonOlder -, setuptools +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + python-dotenv, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -24,13 +25,9 @@ buildPythonPackage rec { hash = "sha256-fhZMn0v908VzV+JLuS8tM+BPKJBoj77vEh1pINL4Cco="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - aiohttp - ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ aioresponses @@ -39,9 +36,7 @@ buildPythonPackage rec { python-dotenv ]; - pythonImportsCheck = [ - "bring_api" - ]; + pythonImportsCheck = [ "bring_api" ]; meta = with lib; { description = "Module to access the Bring! shopping lists API"; From 542ec09bfd20d162a4ee85cb7694b8509897be2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Apr 2024 09:35:08 +0200 Subject: [PATCH 6/6] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4db1bebad17c..7b066a0130f4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -570,7 +570,8 @@ "brel_home" = ps: with ps; [ ]; "bring" = ps: with ps; [ - ]; # missing inputs: bring-api + bring-api + ]; "broadlink" = ps: with ps; [ broadlink ]; @@ -6004,6 +6005,7 @@ "bond" "bosch_shc" "braviatv" + "bring" "broadlink" "brother" "brottsplatskartan"