From a575d59eaaeb5ef3e095eaebf71913225fb72feb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Feb 2024 10:12:26 +0100 Subject: [PATCH 1/2] python311Packages.pyrainbird: 4.0.1 -> 4.0.2 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/4.0.1...4.0.2 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/4.0.2 --- 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 44d4e83794fa..c7417d7fee28 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OcCg6Q+FJnmrYf70uNLWTg/tfWVJpiQlnyKfREcP2YM="; + hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; }; postPatch = '' From 2c57e8e62dc84f41fe91a41833095f66ace30a22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Feb 2024 10:14:22 +0100 Subject: [PATCH 2/2] python311Packages.pyrainbird: refactor --- .../python-modules/pyrainbird/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index c7417d7fee28..bca013babd9e 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -18,30 +18,32 @@ , requests , requests-mock , responses +, setuptools }: buildPythonPackage rec { pname = "pyrainbird"; version = "4.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; - repo = pname; + repo = "pyrainbird"; rev = "refs/tags/${version}"; hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=pyrainbird --cov-report=term-missing" "" - - substituteInPlace setup.cfg \ - --replace "pycryptodome>=3.16.0" "pycryptodome" + --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp-retry ical