diff options
Diffstat (limited to 'app-admin/ansible-lint')
| -rw-r--r-- | app-admin/ansible-lint/Manifest | 7 | ||||
| -rw-r--r-- | app-admin/ansible-lint/ansible-lint-24.2.2.ebuild | 58 | ||||
| -rw-r--r-- | app-admin/ansible-lint/ansible-lint-24.9.2.ebuild (renamed from app-admin/ansible-lint/ansible-lint-24.6.0.ebuild) | 6 | ||||
| -rw-r--r-- | app-admin/ansible-lint/files/ansible-lint-24.7.0-warnings.patch | 22 |
4 files changed, 30 insertions, 63 deletions
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 339c10a71bc3..26c94415122d 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,7 +1,6 @@ -DIST ansible-lint-24.2.2.tar.gz 515822 BLAKE2B e9d8e689dfe4e4efbd4dad44ff3567f50412400ed979f2d60150f09f17c5f63f2441f25a33ecdf0112024ced07e62ac16b8a2dbc1c01d62855ec785fc75d1b9a SHA512 3de6b14e4b64ba577abcb67920a45dbf45fedb84e21091cd6a29e3c52a7a91555a152ee3e265624aafbf9dddba96d04241c2598a18f2103ce2cae48706142446 -DIST ansible_lint-24.6.0.tar.gz 529088 BLAKE2B 3d307669d2035eb5a3a8295b40e3afca92ca4eae4ea419948fd2fa86127e05c60f3ca037a4b85b447320ba8a57f7e1a736a55d63aac80e386f9fc4d733190b09 SHA512 1eb8e3e1805ff98ae76ddcd873a5e90b0b0182fbbce3c40844b2a9069e6879fef906e14f98dd77e41372e461ea4350388b68e08be420afaf5d6c449a449a7989 +AUX ansible-lint-24.7.0-warnings.patch 960 BLAKE2B 8305b941970c5f06e466052545b35c241f260c532986d801a9e47593e994b7a753acdeb0d33491b8df88c1a4ec049b632bcd3e4b9c98175d81a7d874859eddfd SHA512 cd285fcebc4e6106aaca3e9f017e0b709f141ee45824deb9aaf7609c5171b6648ff7704d9cdbbca1cf756970e2a5d5b72e4d69d3959e5915fdc08d230e04c056 DIST ansible_lint-24.7.0.tar.gz 530977 BLAKE2B bc6b98b2372dc58bedc8fc305ebad72e75bddf980906789f51f8dde9eda9b2f51ad3397b8dc2bb5712c1abbf61d08a1a6ab5c1468d6ae10404846f952e2fc078 SHA512 1ba69c7fd2c29f89cc2526ad14ea6a7aff4a0715d3dddf0abc79d6dae9bc5ad02152bdece635684a0d1a805a816ea2f28b2a07c5570975bb73bfa332e8679109 -EBUILD ansible-lint-24.2.2.ebuild 1734 BLAKE2B cb94d883bce5f2d8bd26dc3ef73d3a742c4457cfcccf8dfa1c51c581af41e07269d914ea93c2a428ff66ac2b0f9ac77e89f8bab58f93eb959b94cbc476771566 SHA512 14c01aa109fbef294e21b29c92d7eef24a2fa54a549a266f562869bc74ca36c2221e211f1abe3382130d7308defef35b32a893e344cb2ea110b3eb59d7c6f43a -EBUILD ansible-lint-24.6.0.ebuild 1764 BLAKE2B c26279212ba8e6ae6482d69480f56339157f85d1196ae75045820db4ce8219b149dbd5212842c8ee03a9273eed554881867d726e964697d231c65f1d0ca5cf25 SHA512 5ff23b3d1bb2546ea8f756d3fac0467e9ba106c5ee5009e7b884e226bbbe92ceb824d7887a4ee095da7fabd42be72771bcaeef8165dc9573349d93be49731aeb +DIST ansible_lint-24.9.2.tar.gz 536244 BLAKE2B db7195d569698a2c5d43b0b0293dc2fa97cf3f5de8807b95e43f991b12432cdaedaa0b4a7165cd7af5a67142062eaa981ccb642888153d97296ae4125fe4019d SHA512 ae570ae86e31b83ab89e1b4c7f0996165ecb40299a8374fd5baac4ff955aa17f0a05542a7d14683e43e680fc6e55acb862589fa48b86b82a11dc31bf6a0d6aab EBUILD ansible-lint-24.7.0.ebuild 1763 BLAKE2B c9e4f1a62118ae614071f7a4889be9c4138906889383110e28422e02fb085c4ab77d426c300ee44393be1291e6c55cea990597137e45f15ec92102314e831ef3 SHA512 11a8dedda151a3a526d621f0c06538d5a7bf461365d3660f21de2a05695366dfd95bb9eeecc62eea5f7ac2daf0aca08ea5eedd755b0f2c4d073d0e67d57cd769 +EBUILD ansible-lint-24.9.2.ebuild 1820 BLAKE2B a9a1c68e8b69c1cceb4e2da361bc17a7c6e1a9d50f85415debaa0e03105203a7e27d04cf69a8fc98af7e50d0dbdc4a2a5dc2c53a221d695a122e5d35a4bd98e8 SHA512 f3de4f4d26d43d9c317b5a98783228f79f532037f388f8047cfb17a7352a3d40e11625482f8b433298e94a5f1654299520ae31ba5d30c52770c14191c13231cd MISC metadata.xml 601 BLAKE2B 48a208d7526866289af9c33182cc7826cc18d06c0e5de31b7bd2ef45592ea52ad0dfd279a23423268db5842a57fab70c742fb6ff245673e91262b3d043f4add4 SHA512 294746891e5a2b280e59fa177cfa07d1570efc8360a86269895616202c24cbab94a88f49b1b5f9f6bddf869b6610ab0506955421e8bacf2e51f570e8262936da diff --git a/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild deleted file mode 100644 index 1995f0728a37..000000000000 --- a/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" -HOMEPAGE="https://github.com/ansible/ansible-lint" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv" - -# Upstream has stated explicitly that all tests require Internet access -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-4.1.11[${PYTHON_USEDEP}] - >=dev-python/black-22.8.0[${PYTHON_USEDEP}] - >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}] - >=dev-python/packaging-21.3[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}] - >=dev-python/rich-12.0.0[${PYTHON_USEDEP}] - >=dev-python/ruamel-yaml-0.18.5[${PYTHON_USEDEP}] - >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}] - >=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}] - dev-vcs/git" -BDEPEND=" - >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] - test? ( - dev-python/mypy[${PYTHON_USEDEP}] - dev-python/jmespath[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - >=dev-python/pytest-plus-0.6[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] - )" - -# test_call_from_outside_venv doesn't play nicely with the sandbox -# irrespective of whether Internet access is allowed or not -EPYTEST_DESELECT=( - test/test_main.py::test_call_from_outside_venv -) - -distutils_enable_tests pytest - -# Test suite fails to start without this -python_test() { - epytest test -} diff --git a/app-admin/ansible-lint/ansible-lint-24.6.0.ebuild b/app-admin/ansible-lint/ansible-lint-24.9.2.ebuild index 057962e736a9..5f2a99479951 100644 --- a/app-admin/ansible-lint/ansible-lint-24.6.0.ebuild +++ b/app-admin/ansible-lint/ansible-lint-24.9.2.ebuild @@ -21,7 +21,7 @@ RESTRICT="test" RDEPEND=" >=app-admin/ansible-core-2.13.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-24.5.0[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-24.9.1[${PYTHON_USEDEP}] >=dev-python/black-24.3.0[${PYTHON_USEDEP}] >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] dev-python/importlib-metadata[${PYTHON_USEDEP}] @@ -44,6 +44,10 @@ BDEPEND=" >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/${PN}-24.7.0-warnings.patch +) + # test_call_from_outside_venv doesn't play nicely with the sandbox # irrespective of whether Internet access is allowed or not EPYTEST_DESELECT=( diff --git a/app-admin/ansible-lint/files/ansible-lint-24.7.0-warnings.patch b/app-admin/ansible-lint/files/ansible-lint-24.7.0-warnings.patch new file mode 100644 index 000000000000..6386bfe010c9 --- /dev/null +++ b/app-admin/ansible-lint/files/ansible-lint-24.7.0-warnings.patch @@ -0,0 +1,22 @@ +Author: John M. Harris Jr. <johnmh@johnmh.me> +Date: Mon Nov 11 00:26:19 2024 -0700 + +Remove unnecessary warning + +On Gentoo systems, this check normally throws unnecessary warnings. +Assume we're using system-provided ansible when the path begins with +"/usr/lib/python-exec/python3." + +diff --git a/src/ansiblelint/__main__.py b/src/ansiblelint/__main__.py +index ca4a33b6..c2dd3cef 100755 +--- a/src/ansiblelint/__main__.py ++++ b/src/ansiblelint/__main__.py +@@ -461,7 +461,7 @@ def path_inject(own_location: str = "") -> None: + if own_location: + own_location = os.path.realpath(own_location) + parent = Path(own_location).parent +- if (parent / "ansible").exists() and str(parent) not in paths: ++ if not str(parent).startswith("/usr/lib/python-exec/python3.") and (parent / "ansible").exists() and str(parent) not in paths: + inject_paths.append(str(parent)) + + if not os.environ.get("PYENV_VIRTUAL_ENV", None): |