app-admin/ansible-lint: add 6.2.1, drop 6.1.0

Signed-off-by: Marek Szuba <marecki@gentoo.org>

2 files changed, 9 insertions, 14 deletions

diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 9337e75978ed..efd9341f5b10 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,3 @@
 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.1.0.tar.gz 223702 BLAKE2B 5aeaccbaf9c1bd8e7236e946b408779b42e0839766a485bdbb80ece19ed63b57fa38cb44796c860f6929bb2e98acd21a3de3a9c07486535ed3e6ab5cb499c8d9 SHA512 c1ca5abe8e5f441a86db6a4b4fa03c2d87ed2277151ada9af34c3d8af6934d2c1d4b6bffbc11d6cfb7cd7601c9e43a041fe8a2b940fa0630532df05004e11d15
+DIST ansible-lint-6.2.1.tar.gz 233137 BLAKE2B 8e2a9e989765eb51e6ba01d7118bbff793b73fed35a37ca652a4228731659321cb0de5cf2c76b3aa2d0e63c434bc28f1c3b8df5e91aca132a0291f51460e29f2 SHA512 fb3eb8485078f4b426e11dc2b67ef2987640a97552979ef7b192980f750fb798ceab843d95c5e34d0c988cd312a2b5e7b4d58d84c1c5b4f385840ff3a58ac183
diff --git a/app-admin/ansible-lint/ansible-lint-6.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.2.1.ebuild
index 994f48b51065..8e20fa3a01ff 100644
--- a/app-admin/ansible-lint/ansible-lint-6.1.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.2.1.ebuild
@@ -17,14 +17,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# Since 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.3[${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}]
@@ -46,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
@@ -63,15 +64,9 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 python_test() {
-	# For some reason the schema files do not get installed in spite of being present in release tarballs,
-	# with the test suite relying on "refreshing" them (i.e. downloading them from the Internet) instead
-	# - and seemingly occasionally failing to do even that right. Just stick with the bundled files.
-	# TODO: check if this is still needed every new release.
-	local schemadir="${BUILD_DIR}/install/$(python_get_sitedir)/ansiblelint/schemas/"
-	cp src/ansiblelint/schemas/*.json "${schemadir}" || die
+	# 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
-
-	# Make sure src_install() does not install these regardless of whether src_test() has run or not.
-	rm "${schemadir}"/*.json || die
 }