From 116732a9158048a8751537940793825aafc81c4a Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 2 Nov 2024 17:33:58 +0100 Subject: [PATCH 1/4] python312Packages.radish-bdd: fix missing yaml dependency ``` Traceback (most recent call last): File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/bin/.radish-test-wrapped", line 6, in from radish.testing.__main__ import main File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/lib/python3.12/site-packages/radish/testing/__main__.py", line 15, in from radish.testing.matches import test_step_matches_configs File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/lib/python3.12/site-packages/radish/testing/matches.py", line 12, in import yaml ModuleNotFoundError: No module named 'yaml' ``` radish-test requires pyyaml at runtime. --- pkgs/development/python-modules/radish-bdd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 6e350cbccf71..37661847952b 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { lxml parse-type pysingleton + pyyaml tag-expressions ]; @@ -48,7 +49,6 @@ buildPythonPackage rec { freezegun pytest-mock pytestCheckHook - pyyaml ]; pythonImportsCheck = [ "radish" ]; @@ -60,6 +60,9 @@ buildPythonPackage rec { homepage = "https://radish-bdd.github.io/"; changelog = "https://github.com/radish-bdd/radish/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ + kalbasit + l33tname + ]; }; } From 7e479605998792ca339e82947b4a3e9b328a6e8b Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 9 Nov 2024 17:49:36 +0100 Subject: [PATCH 2/4] python312Packages.radish-bdd: remove unused dependencies --- pkgs/development/python-modules/radish-bdd/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 37661847952b..501ef441dd45 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -1,13 +1,11 @@ { lib, buildPythonPackage, - click, colorful, docopt, fetchFromGitHub, freezegun, humanize, - lark, lxml, parse-type, pysingleton, @@ -33,11 +31,9 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - click colorful docopt humanize - lark lxml parse-type pysingleton From e4525288a6662939abdf9871d7ab0815a55aad1c Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 9 Nov 2024 18:12:33 +0100 Subject: [PATCH 3/4] python312Packages.radish-bdd: re-enable all tests --- pkgs/development/python-modules/radish-bdd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 501ef441dd45..06e41abca237 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -49,8 +49,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "radish" ]; - disabledTests = [ "test_main_cli_calls" ]; - meta = with lib; { description = "Behaviour-Driven-Development tool for python"; homepage = "https://radish-bdd.github.io/"; From bcf8a7f4e0edb7cd5fa84b158a9b0cda43824825 Mon Sep 17 00:00:00 2001 From: fliiiix Date: Sat, 9 Nov 2024 19:21:03 +0100 Subject: [PATCH 4/4] python312Packages.radish-bdd: disable 3.9 and older since it breaks --- pkgs/development/python-modules/radish-bdd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 06e41abca237..6ce30ff6f81c 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { version = "0.17.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = pname;