From 9a05755c94afd3eac5dc637b60c86680745e174c Mon Sep 17 00:00:00 2001 From: Danil Suetin Date: Mon, 20 Jan 2025 22:09:11 +0100 Subject: [PATCH 1/2] python312Packages.milc: 1.8.0 -> 1.9.1 --- pkgs/development/python-modules/milc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index 4aaba74782ea..fa5f386a7fd6 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -2,35 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, - appdirs, argcomplete, colorama, halo, + platformdirs, spinners, types-colorama, + typing-extensions, nose2, semver, }: buildPythonPackage rec { pname = "milc"; - version = "1.8.0"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "clueboard"; repo = "milc"; rev = version; - hash = "sha256-DUA79R/pf/arG4diJKaJTSLNdB4E0XnS4NULlqP4h/M="; + hash = "sha256-byj2mcDxLl7rZEFjAt/g1kHllnVxiTIQaTMG24GeSVc="; }; propagatedBuildInputs = [ - appdirs argcomplete colorama halo + platformdirs spinners types-colorama + typing-extensions ]; nativeCheckInputs = [ From d23f8d2582c46305d0373ecf90315eb34b46d04a Mon Sep 17 00:00:00 2001 From: Danil Suetin Date: Mon, 20 Jan 2025 22:56:47 +0100 Subject: [PATCH 2/2] python312Packages.milc: refactor and add tests --- .../python-modules/milc/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index fa5f386a7fd6..f6d9e319827f 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -9,23 +9,37 @@ spinners, types-colorama, typing-extensions, - nose2, + setuptools, + pytestCheckHook, semver, }: buildPythonPackage rec { pname = "milc"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "clueboard"; repo = "milc"; - rev = version; + tag = version; hash = "sha256-byj2mcDxLl7rZEFjAt/g1kHllnVxiTIQaTMG24GeSVc="; }; - propagatedBuildInputs = [ + postPatch = '' + # Needed for tests + patchShebangs --build \ + example \ + custom_logger \ + questions \ + sparkline \ + hello \ + passwd_confirm \ + passwd_complexity \ + config_source + ''; + + dependencies = [ argcomplete colorama halo @@ -35,8 +49,12 @@ buildPythonPackage rec { typing-extensions ]; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ - nose2 + pytestCheckHook semver ];