diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 12002f4933c4..dec3ad21bdeb 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.5"; + version = "2.16.2"; src = fetchPypi { inherit pname version; - hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; + hash = "sha256-5KtVnn5SWxxvmQhPyoc7sBR3XV7L6EW3wHuOnWycBIs="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 1a83d0ed064f..705c578f3bd5 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,29 +1,30 @@ { lib , stdenv +, ansible-compat , ansible-core , buildPythonPackage , coreutils , fetchFromGitHub +, packaging , pytest , pytestCheckHook , pythonOlder , setuptools , setuptools-scm -, wheel }: buildPythonPackage rec { pname = "pytest-ansible"; - version = "4.1.1"; - format = "pyproject"; + version = "24.1.1"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-51DQ+NwD454XaYLuRxriuWRZ8uTSX3ZpadXdxs7FspQ="; + hash = "sha256-UPQx+CGJgaK4XVNngtzzncSueQN9LWh1gMmH5nGtPNk="; }; postPatch = '' @@ -34,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; buildInputs = [ @@ -43,6 +43,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ansible-core + ansible-compat + packaging ]; nativeCheckInputs = [ @@ -77,6 +79,9 @@ buildPythonPackage rec { # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" + ] ++ lib.optionals (lib.versionAtLeast ansible-core.version "2.16") [ + # Test fail in the NixOS environment + "tests/test_adhoc.py" ]; pythonImportsCheck = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d9274f3eace..b868e6123b53 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 + ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdd3992e083b..5d156a6715ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18253,8 +18253,15 @@ with pkgs; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_15; - ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible = ansible_2_16; + ansible_2_16 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_15 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.15.5"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; + }; + })); ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.14.13"; src = oldAttrs.src.override { @@ -18262,13 +18269,6 @@ with pkgs; hash = "sha256-ThuzNPDDImq0jFme/knNX+A/JdRVi8BsJ0reK6PiV2o="; }; })); - ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.13.10"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-1LQKSq+GDe9sLJ6K1SAfhoPj59fY4hRjxtWepPixLfc="; - }; - })); ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };