Unverified Commit 2b356dae authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #240818 from tjni/ansible-runner 

python310Packages.ansible-runner: 2.3.1 -> 2.3.3
parents 86ab77fc bc36fadf

pkgs/development/python-modules/ansible-runner/default.nix

+16 −7
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 
, ansible-core

, buildPythonPackage

, fetchPypi

, fetchpatch

, glibcLocales

, importlib-metadata

, mock

, openssh

, pbr
@@ -21,16 +23,25 @@ 


buildPythonPackage rec {

  pname = "ansible-runner";

  version = "2.3.1";

  version = "2.3.3";

  format = "setuptools";



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y=";

    hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs=";

  };



  patches = [

    (fetchpatch {

      name = "fix-tests.patch";

      url = "https://github.com/ansible/ansible-runner/commit/0d522c90cfc1f305e118705a1b3335ccb9c1633d.patch";

      hash = "sha256-eTnQkftvjK0YHU+ovotRVSuVlvaVeXp5SvYk1DPCg88=";

      excludes = [ ".github/workflows/ci.yml" "tox.ini" ];

    })

  ];



  nativeBuildInputs = [

    pbr

  ];
@@ -42,6 +53,8 @@ buildPythonPackage rec { 
    python-daemon

    pyyaml

    six

  ] ++ lib.optionals (pythonOlder "3.10") [

    importlib-metadata

  ];



  nativeCheckInputs = [
@@ -70,10 +83,6 @@ buildPythonPackage rec { 
    "test_large_stdout_blob"

    # Failed: DID NOT RAISE <class 'RuntimeError'>

    "test_validate_pattern"

  ] ++ lib.optionals stdenv.isDarwin [

    # test_process_isolation_settings is currently broken on Darwin Catalina

    # https://github.com/ansible/ansible-runner/issues/413

    "process_isolation_settings"

  ];



  disabledTestPaths = [

pkgs/development/python-modules/ansible/core.nix

+14 −1
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, pythonOlder

, pythonRelaxDepsHook

, installShellFiles

, ansible

, cryptography

, importlib-resources

, jinja2

, junit-xml

, lxml
@@ -41,6 +44,8 @@ buildPythonPackage rec { 


  nativeBuildInputs = [

    installShellFiles

  ] ++ lib.optionals (pythonOlder "3.10") [

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = [
@@ -64,7 +69,15 @@ buildPythonPackage rec { 
    requests

    scp

    xmltodict

  ] ++ lib.optional windowsSupport pywinrm;

  ] ++ lib.optionals windowsSupport [

    pywinrm

  ] ++ lib.optionals (pythonOlder "3.10") [

    importlib-resources

  ];



  pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [

    "importlib-resources"

  ];



  postInstall = ''

    installManPage docs/man/man1/*.1