From 844c1dcf92e3f2cc620bc9983008d91b92cd65c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 May 2024 10:17:21 +0200 Subject: [PATCH 1/4] python312Packages.pyrainbird: refactor --- pkgs/development/python-modules/pyrainbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index bca013babd9e..654c73b227b9 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -40,11 +40,11 @@ buildPythonPackage rec { --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp-retry ical pycryptodome From c019fcde714510cc14d196dda96b411ee84ede85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 May 2024 10:18:55 +0200 Subject: [PATCH 2/4] python312Packages.pyrainbird: 4.0.2 -> 5.0.0 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/4.0.2...5.0.0 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/5.0.0 --- pkgs/development/python-modules/pyrainbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 654c73b227b9..a84f8ebe5cec 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -4,9 +4,9 @@ , fetchFromGitHub , freezegun , ical +, mashumaro , parameterized , pycryptodome -, pydantic , pytest-aiohttp , pytest-asyncio , pytest-golden @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "4.0.2"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "pyrainbird"; rev = "refs/tags/${version}"; - hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; + hash = "sha256-72FmcZOCe90Yt/Osa5YALMbdZwxwNgTbpXSmvJdkC8Q="; }; postPatch = '' @@ -47,8 +47,8 @@ buildPythonPackage rec { dependencies = [ aiohttp-retry ical + mashumaro pycryptodome - pydantic python-dateutil pyyaml requests From fa030ff6a54162ea131516c1907ee0b28d1d58d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 May 2024 10:19:09 +0200 Subject: [PATCH 3/4] python312Packages.pyrainbird: format with nixfmt --- .../python-modules/pyrainbird/default.nix | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index a84f8ebe5cec..4f98e9436aaf 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,24 +1,25 @@ -{ lib -, aiohttp-retry -, buildPythonPackage -, fetchFromGitHub -, freezegun -, ical -, mashumaro -, parameterized -, pycryptodome -, pytest-aiohttp -, pytest-asyncio -, pytest-golden -, pytest-mock -, pytestCheckHook -, python-dateutil -, pythonOlder -, pyyaml -, requests -, requests-mock -, responses -, setuptools +{ + lib, + aiohttp-retry, + buildPythonPackage, + fetchFromGitHub, + freezegun, + ical, + mashumaro, + parameterized, + pycryptodome, + pytest-aiohttp, + pytest-asyncio, + pytest-golden, + pytest-mock, + pytestCheckHook, + python-dateutil, + pythonOlder, + pyyaml, + requests, + requests-mock, + responses, + setuptools, }: buildPythonPackage rec { @@ -40,9 +41,7 @@ buildPythonPackage rec { --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp-retry @@ -68,9 +67,7 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ - "pyrainbird" - ]; + pythonImportsCheck = [ "pyrainbird" ]; meta = with lib; { description = "Module to interact with Rainbird controllers"; From 9cfdf95d276eafe719bed8c277aa48044ae21656 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 May 2024 22:53:24 +0200 Subject: [PATCH 4/4] python311Packages.pyrainbird: 5.0.0 -> 6.0.1 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/5.0.0...6.0.1 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/6.0.1 --- pkgs/development/python-modules/pyrainbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 4f98e9436aaf..131cf9f551de 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "5.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "pyrainbird"; rev = "refs/tags/${version}"; - hash = "sha256-72FmcZOCe90Yt/Osa5YALMbdZwxwNgTbpXSmvJdkC8Q="; + hash = "sha256-kRPRyEt31SJpNRXcTshGByKAfPzEj+CDNpEQp4Klgks="; }; postPatch = ''