Merge pull request #232115 from mweinelt/ansible-apps

ansible-lint: 6.15.0 -> 6.16.0; ansible-compat: 4.0.2 -> 4.0.4; remove ansible-lint and ansible-doctor from python-modules

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "ansible-compat";
-  version = "4.0.2";
+  version = "4.0.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JbDcWro8Q+DP3JFATlcErphX5mTCEPf4SlVm4A111/M=";
+    hash = "sha256-rXzr++4EVt+/7g6AJRWxEeABYCVSUFF0+jo1/wi6Izk=";
   };
 
   nativeBuildInputs = [

pkgs/tools/admin/ansible/doctor.nix

@@ -1,28 +1,13 @@
 { lib
-, anyconfig
-, appdirs
-, buildPythonPackage
-, colorama
-, environs
 , fetchFromGitHub
-, jinja2
-, jsonschema
-, nested-lookup
-, pathspec
-, poetry-core
-, python-json-logger
-, pythonOlder
-, pythonRelaxDepsHook
-, ruamel-yaml
+, python3
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ansible-doctor";
   version = "2.0.4";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
@@ -37,12 +22,12 @@ buildPythonPackage rec {
       --replace 'version = "0.0.0"' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     anyconfig
     appdirs
     colorama

pkgs/tools/admin/ansible/later.nix

@@ -1,34 +1,13 @@
 { lib
-, ansible
-, ansible-core
-, anyconfig
-, appdirs
-, buildPythonPackage
-, colorama
 , fetchFromGitHub
-, flake8
-, jsonschema
-, nested-lookup
-, pathspec
-, poetry-core
-, pytest-mock
-, python-json-logger
-, pytestCheckHook
-, pythonRelaxDepsHook
-, pythonOlder
-, pyyaml
-, toolz
-, unidiff
-, yamllint
+, python3
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ansible-later";
   version = "3.3.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = pname;
@@ -53,12 +32,12 @@ buildPythonPackage rec {
     "yamllint"
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     ansible
     ansible-core
     anyconfig
@@ -75,7 +54,7 @@ buildPythonPackage rec {
     yamllint
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     pytest-mock
     pytestCheckHook
   ];

pkgs/tools/admin/ansible/lint.nix

@@ -1,35 +1,17 @@
 { lib
-, buildPythonPackage
+, python3
 , fetchPypi
-, setuptools-scm
-, ansible-compat
-, ansible-core
-, black
-, enrich
-, filelock
-, flaky
-, jsonschema
-, pythonOlder
-, pytest
-, pytest-xdist
-, pytestCheckHook
-, pyyaml
-, rich
-, ruamel-yaml
-, wcmatch
-, yamllint
+, ansible
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ansible-lint";
-  version = "6.15.0";
+  version = "6.16.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TOeQzwAGdgugHYuUbYAwNwL8dFS9GcazB53ZjUBRfm8=";
+    hash = "sha256-34Lzk18SCeMHRAjurl6DfM7G/VLB0xJmif9BJKuwpcs=";
   };
 
   postPatch = ''
@@ -38,21 +20,27 @@ buildPythonPackage rec {
       --replace "sys.exit(1)" ""
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools
     setuptools-scm
+    pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = [
-    ansible-compat
+  pythonRelaxDeps = [
+    "ruamel.yaml"
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    # https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in
     ansible-core
     black
-    enrich
     filelock
     jsonschema
-    pytest # yes, this is an actual runtime dependency
+    packaging
     pyyaml
     rich
     ruamel-yaml
+    subprocess-tee
     wcmatch
     yamllint
   ];
@@ -60,7 +48,7 @@ buildPythonPackage rec {
   # tests can't be easily run without installing things from ansible-galaxy
   doCheck = false;
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     flaky
     pytest-xdist
     pytestCheckHook
@@ -69,7 +57,7 @@ buildPythonPackage rec {
   preCheck = ''
     # ansible wants to write to $HOME and crashes if it can't
     export HOME=$(mktemp -d)
-    export PATH=$PATH:${lib.makeBinPath [ ansible-core ]}
+    export PATH=$PATH:${lib.makeBinPath [ ansible ]}
 
     # create a working ansible-lint executable
     export PATH=$PATH:$PWD/src/ansiblelint
@@ -95,7 +83,7 @@ buildPythonPackage rec {
     "test_discover_lintables_umlaut"
   ];
 
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ];
+  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ];
 
   meta = with lib; {
     description = "Best practices checker for Ansible";

pkgs/top-level/all-packages.nix

@@ -17511,7 +17511,7 @@ with pkgs;
     meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
   }));
 
-  ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
+  ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };
 
   phpunit = callPackage ../development/tools/misc/phpunit { };
 
@@ -17571,9 +17571,9 @@ with pkgs;
     zig = buildPackages.zig_0_10;
   };
 
-  ansible-later = with python3.pkgs; toPythonApplication ansible-later;
+  ansible-later = callPackage ../tools/admin/ansible/later.nix { };
 
-  ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
+  ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
 
   antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
   antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };

pkgs/top-level/python-aliases.nix

@@ -36,6 +36,9 @@ mapAliases ({
   abodepy = jaraco-abode; # added 2023-02-01
   aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
   ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
+  ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
+  ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16
+  ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16
   anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   argon2_cffi = argon2-cffi; # added 2022-05-09
   APScheduler = apscheduler; # added 2023-02-19

pkgs/top-level/python-packages.nix

@@ -494,14 +494,8 @@ self: super: with self; {
 
   ansible-core = callPackage ../development/python-modules/ansible/core.nix { };
 
-  ansible-doctor = callPackage ../development/python-modules/ansible-doctor { };
-
   ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
 
-  ansible-later = callPackage ../development/python-modules/ansible-later { };
-
-  ansible-lint = callPackage ../development/python-modules/ansible-lint { };
-
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
 
   ansi = callPackage ../development/python-modules/ansi { };