diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-admin/ansible-lint | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'app-admin/ansible-lint')
-rw-r--r-- | app-admin/ansible-lint/Manifest | 6 | ||||
-rw-r--r-- | app-admin/ansible-lint/ansible-lint-6.2.2.ebuild (renamed from app-admin/ansible-lint/ansible-lint-6.0.2.ebuild) | 13 | ||||
-rw-r--r-- | app-admin/ansible-lint/ansible-lint-6.3.0.ebuild | 72 |
3 files changed, 84 insertions, 7 deletions
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index cf3d84ee0943..7adb00c8887a 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,6 +1,8 @@ AUX ansible-lint-6.0.2_test-module-check.patch 689 BLAKE2B 69152c8799165f8efcf44640ad44133147e95945aeb4aee7a5a45aa0e74432fce599040f017ae92fb7264855f74c0bcd71a44e26abf0abebfcce2cbcaea39ada SHA512 01be971c7d33086aa799910ac744cfceb07b4d5041716043c49667075ab8c8579b57f0c14a8094248f96462c93fff3ac110776aa0aa1ea3adf11dc622028ca7e DIST ansible-lint-5.4.0.tar.gz 349353 BLAKE2B 9f41abdf1e9485afa4c8ed9498627b0dcbdcf57916f3b57c9886de8bd806e4e5b34e7e9c2e66b44ac8009a0afcea4d8566900ee8d391eaca61081fa23323c41c SHA512 f1bbbb49eb77991d60b6087646c695a938d328d719bba67707af4ed858de857d383b78490bcf0930cffebd13a0b0abde20269a47e47e4713a37da715a28c5da0 -DIST ansible-lint-6.0.2.tar.gz 195044 BLAKE2B 3334049dd1dc05444c6c362601da8d7e808c6b3473e87613b8892651cecb76058cb0aa370aa5d00cf6bc76ee3b096480fdce52facee4f043c01d6c76084860ba SHA512 a47e79c59dfcf3e36654247bd206581798f2559261142e3943b60e0688d75b5a6332832a9f9127f99b2faa6afff959a33c55fbc80aa5881f064725998420f679 +DIST ansible-lint-6.2.2.tar.gz 232952 BLAKE2B 571dce6dc348c1158fed396fc29054421d172964facd8cbb0f8c1560036de574aa304f59497c8c76415ac99424d0450c8b06509ced113c9a997808e960793621 SHA512 ae119b29d87ce59e7bd5c401a8fcbc2194bdddecd5a65010ea02aee62cff1764a767803a57edcfd297e9ad0cbdf70fe69212625ed80b21afb53b4ebe429a7636 +DIST ansible-lint-6.3.0.tar.gz 268331 BLAKE2B 00ea2dbc7bb5e71d63a737ac99d4116441f6b1eee2fa476d9aa4d78068064e53975df00950f337e7c9e25dacf8778ddd2e40eb5d3ea1301f56a80dfd90d42c20 SHA512 3e9d480cb90f3022a4b001c061c3e76b753620776a009b1563dce335c13ee38b7ac334725592ac644a2808d85ceb98b618a451c193bc7c4961474d4e7fbbb88e EBUILD ansible-lint-5.4.0.ebuild 1852 BLAKE2B 913794c189a58ed0fa3cd0febde7b0ac4788294bee7b1309eb1d70f5619289d4c80f57a8227a7a834ce299c6a24a7c59285425c737d7b0cbd1e53c47ac570650 SHA512 5ca55f7c4d72b01d95813ecef1f3e984ff92993fb0cbf7e5090d938349dba942b88e695e6e34e022385c5a4d6e1fb457766d19aee606ceddedc458fa84c91bb4 -EBUILD ansible-lint-6.0.2.ebuild 2259 BLAKE2B 5fecb95420b58fe2892e0f825e935494bc548d8e2b7a89a43b5706c224f13c463b4bb1f95299549dc5974976a3d20ab430c588016e0588065a967e0e40baedc1 SHA512 96383643638ab38ab80a77c1ff513086632e6ccc9e55b79d8e74df1986f8a1af261ca45a0113ab8e0be403bcb3bda6e2573c0e8728405afcacecc0e95f36e7e8 +EBUILD ansible-lint-6.2.2.ebuild 2443 BLAKE2B 65f93d1523c1cea6ceab40516c4b228881660718f4f7a4a2d98ffe205e7aa4e1b43d57ba6f081ff0d8e291889ba470f701e479fa24848eb0ad561fc85def2b5a SHA512 ddd4cfcf1940a27b3af62bd440e81c21c5fc7a6faaec5875398396bfc1dda54ee00023199e8d6f0e10f3c225a3d5ee26c5fd21edd1d59e3cb51e2342e8b8c1f5 +EBUILD ansible-lint-6.3.0.ebuild 2443 BLAKE2B b545898fa4aa33755f8741030b4b38cd6b9ab6b0bcee20f5625f8e6403a6c046d14b52882c1bdbc39c037bce6f48eb1cbd4a2c04f713a9b473254052ffe90f59 SHA512 78ae5e916712528aa349f3bd811f7302b2a364797e3eb8962f354d8d7420b0fdcf8d8a85f6477bfa9d8dd31c8f1addc0e3e736ff130245ae8fd7ea9abfb0c3aa MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36 diff --git a/app-admin/ansible-lint/ansible-lint-6.0.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.2.2.ebuild index e8d11233f9d4..8e20fa3a01ff 100644 --- a/app-admin/ansible-lint/ansible-lint-6.0.2.ebuild +++ b/app-admin/ansible-lint/ansible-lint-6.2.2.ebuild @@ -17,15 +17,17 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~riscv" -# As of 6.0.2, access to Ansible Galaxy (i.e. the Internet) is required even to get -# the test suite started (Bug #836582). TODO: Talk to upstream about how to bypass this. +# Since 6.2.0 ansible-lint once again does not need access to Ansible Galaxy +# even to get the test suite started, however quite a large fraction of tests +# fails without network access. Needs more work. PROPERTIES="test_network" RESTRICT="test" RDEPEND=" >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-2.0.2[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-2.0.4[${PYTHON_USEDEP}] >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] @@ -37,6 +39,7 @@ BDEPEND=" >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}] test? ( >=dev-python/flaky-3.7.0[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] )" @@ -44,7 +47,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.2_test-module-check.patch ) -# Skip problematic tests: +# Skip problematic tests (TODO: update this list for ansible-lint-6.2.0+): # - test_call_from_outside_venv doesn't play nicely with the sandbox # - all test_eco and some test_prerun tests require Internet access # - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox @@ -61,7 +64,7 @@ EPYTEST_DESELECT=( distutils_enable_tests pytest python_test() { - # As of 6.0.2, without this the test suite gets confused by the presence of ansible-lint modules + # As of 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules # in both ${ED} and ${S}. cd "${S}" || die diff --git a/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild new file mode 100644 index 000000000000..6a378c69fa29 --- /dev/null +++ b/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" +HOMEPAGE="https://github.com/ansible/ansible-lint" +# PyPI tarballs do not contain all the data files needed by the tests +SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +# Since 6.2.0 ansible-lint once again does not need access to Ansible Galaxy +# even to get the test suite started, however quite a large fraction of tests +# fails without network access. Needs more work. +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND=" + >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}] + >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}] + >=dev-python/wcmatch-7.0[${PYTHON_USEDEP}] + >=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]" +BDEPEND=" + >=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}] + >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/flaky-3.7.0[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2_test-module-check.patch +) + +# Skip problematic tests (TODO: update this list for ansible-lint-6.2.0+): +# - test_call_from_outside_venv doesn't play nicely with the sandbox +# - all test_eco and some test_prerun tests require Internet access +# - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox +EPYTEST_DESELECT=( + test/test_eco.py + test/test_main.py::test_call_from_outside_venv + test/test_prerun.py::test_install_collection + test/test_prerun.py::test_prerun_reqs_v1 + test/test_prerun.py::test_prerun_reqs_v2 + test/test_prerun.py::test_require_collection_wrong_version + test/test_utils.py::test_cli_auto_detect +) + +distutils_enable_tests pytest + +python_test() { + # As of 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules + # in both ${ED} and ${S}. + cd "${S}" || die + + epytest test +} |