From 1afc4e9ab0e93240a6e1ff279760173d0037d6dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 14:45:37 +0200 Subject: [PATCH 1/2] python312Packages.ansible-runner: refactor --- pkgs/development/python-modules/ansible-runner/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 746877f57e2ef7c..8d8e808773071d8 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' + --replace-fail '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' ''; build-system = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { ''; disabledTests = [ - # Requires network access + # Tests require network access "test_callback_plugin_task_args_leak" "test_env_accuracy" # Times out on slower hardware @@ -95,9 +95,10 @@ buildPythonPackage rec { meta = with lib; { description = "Helps when interfacing with Ansible"; - mainProgram = "ansible-runner"; homepage = "https://github.com/ansible/ansible-runner"; + changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "ansible-runner"; }; } From ad97610187e2d763bef2e2f804d674e00cc12605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 14:48:14 +0200 Subject: [PATCH 2/2] python312Packages.ansible-runner: disable failing tests --- pkgs/development/python-modules/ansible-runner/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 8d8e808773071d8..0e1a3b8ca7a2507 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -76,6 +76,11 @@ buildPythonPackage rec { "test_large_stdout_blob" # Failed: DID NOT RAISE "test_validate_pattern" + # Assertion error + "test_get_role_list" + "test_include_role_from_collection_events" + "test_resolved_actions" + "test_callback_plugin_censoring_does_not_overwrite" ]; disabledTestPaths =