* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/
@ 2020-02-10 13:29 Tony Vroon
0 siblings, 0 replies; 6+ messages in thread
From: Tony Vroon @ 2020-02-10 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 9ca887070a0a703a063cac54afd4de9053b91590
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 13:29:17 2020 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 13:29:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca88707
app-admin/ansible-lint: Version bump to 4.1.0
Squelch DISTUTILS_USE_SETUPTOOLS as suggested by Ferenc Erki on GitHub.
Remove unused setuptools-git from DEPEND as per Ferenc Erki on GitHub.
Scavenge upstream patch identified by Peter on bug 698864 (setuptools).
Concern for Python 2.7 has now ceased due to EOL.
Closes: https://bugs.gentoo.org/681988
Bug: https://bugs.gentoo.org/698864
Closes: https://github.com/gentoo/gentoo/pull/14588
Reported-by: Lik
Suggested-by: Ferenc Erki
Signed-Off-By: Tony Vroon <chainsaw <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
app-admin/ansible-lint/Manifest | 1 +
app-admin/ansible-lint/ansible-lint-4.1.0.ebuild | 39 +++++
...-lint-4.1.0-specifierset-split-setuptools.patch | 175 +++++++++++++++++++++
3 files changed, 215 insertions(+)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 071396fc34a..eddd28d3cda 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1 +1,2 @@
DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4
+DIST ansible-lint-4.1.0.tar.gz 2911091 BLAKE2B b6e414dbdeebcc1cae900736829abf2db0930e5e05ae7c2bbd6d30a89b6ac28485ddfb63528bdc3baae6ef97ae7536507632d43b16f9a16dd86887d781940aeb SHA512 c1d07093d68bf5f43c20c3a999adf26d23ba587d5008a35069dcbab514b208737f5d0ecaf032e43d313233ea06193db81b349d5fb62f3ac684af9e51d8bc6e08
diff --git a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
new file mode 100644
index 00000000000..46715fcb9b4
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/ansible/ansible-lint"
+SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-specifierset-split-setuptools.patch"
+
+CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+ test? (
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+ nosetests || die
+}
diff --git a/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch b/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch
new file mode 100644
index 00000000000..4e4ac16d238
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch
@@ -0,0 +1,175 @@
+From c91d23b2f82b4efb540168132842b243eb2d8b0d Mon Sep 17 00:00:00 2001
+From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
+Date: Thu, 24 Oct 2019 01:38:35 +0200
+Subject: [PATCH] Drop support for setuptools older than 34.4.0
+
+Resolves #599
+---
+ setup.py | 141 +++++--------------------------------------------------
+ 1 file changed, 13 insertions(+), 128 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 25cc9e80d09e4657b56c4c4ed68d9411b7d7eae9..ff4c5bd65a7f5786c5af32750fb83dd3f6d92cec 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,138 +1,16 @@
+ #! /usr/bin/env python
+ """Ansible-lint distribution package setuptools installer."""
+
+-import setuptools
+-
+-
+-try:
+- from setuptools.config import read_configuration, ConfigOptionsHandler
+- import setuptools.config
+- import setuptools.dist
+-
+- # Set default value for 'use_scm_version'
+- setattr(setuptools.dist.Distribution, 'use_scm_version', False)
+-
+- # Attach bool parser to 'use_scm_version' option
+- class ShimConfigOptionsHandler(ConfigOptionsHandler):
+- """Extension class for ConfigOptionsHandler."""
+-
+- @property
+- def parsers(self):
+- """Return an option mapping with default data type parsers."""
+- _orig_parsers = super(ShimConfigOptionsHandler, self).parsers
+- return dict(use_scm_version=self._parse_bool, **_orig_parsers)
+-
+- setuptools.config.ConfigOptionsHandler = ShimConfigOptionsHandler
+-except ImportError:
+- """This is a shim for setuptools<30.3."""
+- import io
+- import json
+-
+- try:
+- from configparser import ConfigParser, NoSectionError
+- except ImportError:
+- from ConfigParser import ConfigParser, NoSectionError
+- ConfigParser.read_file = ConfigParser.readfp
+-
+- def maybe_read_files(d):
+- """Read files if the string starts with `file:` marker."""
+- d = d.strip()
+- if not d.startswith('file:'):
+- return d
+- descs = []
+- for fname in map(str.strip, str(d[5:]).split(',')):
+- with io.open(fname, encoding='utf-8') as f:
+- descs.append(f.read())
+- return ''.join(descs)
+-
+- def cfg_val_to_list(v):
+- """Turn config val to list and filter out empty lines."""
+- return list(filter(bool, map(str.strip, str(v).strip().splitlines())))
+
+- def cfg_val_to_dict(v):
+- """Turn config val to dict and filter out empty lines."""
+- return dict(
+- map(lambda l: list(map(str.strip, l.split('=', 1))),
+- filter(bool, map(str.strip, str(v).strip().splitlines())))
+- )
++__requires__ = ('setuptools >= 34.4', )
+
+- def cfg_val_to_primitive(v):
+- """Parse primitive config val to appropriate data type."""
+- return json.loads(v.strip().lower())
+
+- def read_configuration(filepath):
+- """Read metadata and options from setup.cfg located at filepath."""
+- cfg = ConfigParser()
+- with io.open(filepath, encoding='utf-8') as f:
+- cfg.read_file(f)
+-
+- md = dict(cfg.items('metadata'))
+- for list_key in 'classifiers', 'keywords':
+- try:
+- md[list_key] = cfg_val_to_list(md[list_key])
+- except KeyError:
+- pass
+- try:
+- md['long_description'] = maybe_read_files(md['long_description'])
+- except KeyError:
+- pass
+- opt = dict(cfg.items('options'))
+- for list_key in 'use_scm_version', 'zip_safe':
+- try:
+- opt[list_key] = cfg_val_to_primitive(opt[list_key])
+- except KeyError:
+- pass
+- for list_key in 'scripts', 'install_requires', 'setup_requires':
+- try:
+- opt[list_key] = cfg_val_to_list(opt[list_key])
+- except KeyError:
+- pass
+- try:
+- opt['package_dir'] = cfg_val_to_dict(opt['package_dir'])
+- except KeyError:
+- pass
+- try:
+- opt_package_data = dict(cfg.items('options.package_data'))
+- if not opt_package_data.get('', '').strip():
+- opt_package_data[''] = opt_package_data['*']
+- del opt_package_data['*']
+- except (KeyError, NoSectionError):
+- opt_package_data = {}
+- try:
+- opt_extras_require = dict(cfg.items('options.extras_require'))
+- opt['extras_require'] = {}
+- for k, v in opt_extras_require.items():
+- opt['extras_require'][k] = cfg_val_to_list(v)
+- except NoSectionError:
+- pass
+- opt['package_data'] = {}
+- for k, v in opt_package_data.items():
+- opt['package_data'][k] = cfg_val_to_list(v)
+- cur_pkgs = opt.get('packages', '').strip()
+- if '\n' in cur_pkgs:
+- opt['packages'] = cfg_val_to_list(opt['packages'])
+- elif cur_pkgs.startswith('find:'):
+- opt_packages_find = dict(cfg.items('options.packages.find'))
+- opt['packages'] = setuptools.find_packages(**opt_packages_find)
+- return {'metadata': md, 'options': opt}
+-
+-
+-setup_params = {}
+-declarative_setup_params = read_configuration('setup.cfg')
+-
+-# Patch incorrectly decoded package_dir option
+-# ``egg_info`` demands native strings failing with unicode under Python 2
+-# Ref https://github.com/pypa/setuptools/issues/1136
+-declarative_setup_params['options']['package_dir'] = {
+- str(k): str(v)
+- for k, v in declarative_setup_params['options']['package_dir'].items()
+-}
+-
+-setup_params = dict(setup_params, **declarative_setup_params['metadata'])
+-setup_params = dict(setup_params, **declarative_setup_params['options'])
++import setuptools
++from setuptools.config import read_configuration
+
+
+ def cut_local_version_on_upload(version):
++ """Generate a PEP440 local version if uploading to PyPI."""
+ import os
+ import setuptools_scm.version # only present during setup time
+ IS_PYPI_UPLOAD = os.getenv('PYPI_UPLOAD') == 'true'
+@@ -142,8 +20,15 @@ def cut_local_version_on_upload(version):
+ )
+
+
+-setup_params['use_scm_version'] = {
+- 'local_scheme': cut_local_version_on_upload,
++# This is needed because even new
++# setuptools don't parse
++# `setup_requires` from `setup.cfg`:
++declarative_setup_params = read_configuration('setup.cfg')
++setup_params = {
++ 'setup_requires': declarative_setup_params['options']['setup_requires'],
++ 'use_scm_version': {
++ 'local_scheme': cut_local_version_on_upload,
++ }
+ }
+
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/
@ 2022-04-01 8:18 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-04-01 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 278b221bcab2832838c0fd619ea31204109dba76
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 09:25:22 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 08:18:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278b221b
app-admin/ansible-lint: add 6.0.2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 1 +
app-admin/ansible-lint/ansible-lint-6.0.2.ebuild | 64 ++++++++++++++++++++++
.../ansible-lint-6.0.2_test-module-check.patch | 23 ++++++++
3 files changed, 88 insertions(+)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 349a47f494d5..5f77818c06af 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1 +1,2 @@
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
diff --git a/app-admin/ansible-lint/ansible-lint-6.0.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.0.2.ebuild
new file mode 100644
index 000000000000..4acb496bb6ba
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-6.0.2.ebuild
@@ -0,0 +1,64 @@
+# 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"
+
+RDEPEND="
+ >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+ >=dev-python/ansible-compat-2.0.2[${PYTHON_USEDEP}]
+ >=dev-python/enrich-1.2.6[${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-xdist-2.5.0[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
+)
+
+# Skip problematic tests:
+# - 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.0.2, without this the test suite gets confused by the presence of ansible-lint modules
+ # in both ${ED} and ${S}.
+ cd "${S}" || die
+
+ epytest test
+}
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
new file mode 100644
index 000000000000..4288bb897c1e
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
@@ -0,0 +1,23 @@
+Let the package managers handle dependencies, m'kay?
+
+--- a/conftest.py
++++ b/conftest.py
+@@ -3,18 +3,6 @@
+ import os
+ import sys
+
+-# checking if user is running pytest without installing test dependencies:
+-missing = []
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint", "pytest_cov"]:
+- if not importlib.util.find_spec(module):
+- missing.append(module)
+-if missing:
+- print(
+- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-
+
+ os.environ["NO_COLOR"] = "1"
+ pytest_plugins = ["ansiblelint.testing.fixtures"]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/
@ 2022-09-02 0:48 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-09-02 0:48 UTC (permalink / raw
To: gentoo-commits
commit: a2c09cbf0b3d82b3aac2f5b4ad0d9012ffd971a5
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 1 23:38:54 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 00:48:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c09cbf
app-admin/ansible-lint: add 6.5.2, drop 6.5.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 2 +-
...lint-6.5.1.ebuild => ansible-lint-6.5.2.ebuild} | 2 +-
.../ansible-lint-6.5.2_test-module-check.patch | 32 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index b0e3cc496c55..6df1669c4d41 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,2 +1,2 @@
DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df
-DIST ansible-lint-6.5.1.gh.tar.gz 244320 BLAKE2B aff13d6ce9346dbdba459722cfc071b1e671dc17f3fb44744a706097f29e2a6a9962514fc61e669b58517acf6e95feba88af1bf8c7a4fb668e1a8d1cc5d54746 SHA512 40890a3fc0caaa3fd1d38f32739615dd664db1e7ea534c0bc3138da7295cdc6923715ea12febefc8951be350aad5bf7ac76dd004e3c4aff386b78551bd6442a8
+DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
similarity index 98%
rename from app-admin/ansible-lint/ansible-lint-6.5.1.ebuild
rename to app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
index 117da9fdcf9e..ba4605d1720d 100644
--- a/app-admin/ansible-lint/ansible-lint-6.5.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
)"
PATCHES=(
- "${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
+ "${FILESDIR}"/${PN}-6.5.2_test-module-check.patch
)
# Skip problematic tests:
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
new file mode 100644
index 000000000000..8e6cb512b633
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
@@ -0,0 +1,32 @@
+Let the package managers handle dependencies, m'kay?
+
+--- a/conftest.py
++++ b/conftest.py
+@@ -7,27 +7,6 @@
+ import pytest
+ from ansible.module_utils.common.yaml import HAS_LIBYAML
+
+-# checking if user is running pytest without installing test dependencies:
+-missing = []
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
+- if not importlib.util.find_spec(module):
+- missing.append(module)
+-if missing:
+- print(
+- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-
+-if not HAS_LIBYAML:
+- # While presence of libyaml is not required for runtime, we keep this error
+- # fatal here in order to be sure that we spot libyaml errors during testing.
+- print(
+- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-
+
+ os.environ["NO_COLOR"] = "1"
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/
@ 2022-09-21 18:33 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-09-21 18:33 UTC (permalink / raw
To: gentoo-commits
commit: fdd3f5eb1948b4962f53216630c8dfefa58f4c68
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 21 17:58:08 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 18:33:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd3f5eb
app-admin/ansible-lint: drop 6.4.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 1 -
app-admin/ansible-lint/ansible-lint-6.4.0.ebuild | 75 ----------------------
.../ansible-lint-6.0.2_test-module-check.patch | 23 -------
3 files changed, 99 deletions(-)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index a2e63a13be00..9021b8b0133c 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df
DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
DIST ansible-lint-6.6.1.gh.tar.gz 272235 BLAKE2B 50d014a919b7e915aff541b7be401f287ac990ec3dc435af2356143434fb27619e2e9ebad4a6b0ed57d9b0c1972137c34d08b603eda7f8dba49359d209da2e0a SHA512 bd6c2b695ba65e808f7773deef11bd51693b0343dc356788a87761810295fad32114bfb6f8df8eef69a13702b136f1c1d02b1a9f41c43c6e64174842ec67124f
diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
deleted file mode 100644
index bc3e252daa8c..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
- >=app-admin/ansible-core-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.8.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:
-# - test_call_from_outside_venv doesn't play nicely with the sandbox
-# - all the others require Internet access, mostly in order to access Ansible Galaxy
-EPYTEST_DESELECT=(
- test/test_cli_role_paths.py::test_run_playbook_github
- test/test_eco.py
- test/test_examples.py::test_custom_kinds
- test/test_import_playbook.py::test_task_hook_import_playbook
- test/test_list_rules.py::test_list_rules_includes_opt_in_rules
- test/test_list_rules.py::test_list_rules_with_format_option
- test/test_list_rules.py::test_list_tags_includes_opt_in_rules
- 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_profiles.py::test_profile_listing
- test/test_rules_collection.py::test_rich_rule_listing
- test/test_utils.py::test_cli_auto_detect
- test/test_utils.py::test_template_lookup
- test/test_verbosity.py::test_default_verbosity
-)
-
-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
-}
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
deleted file mode 100644
index 4288bb897c1e..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Let the package managers handle dependencies, m'kay?
-
---- a/conftest.py
-+++ b/conftest.py
-@@ -3,18 +3,6 @@
- import os
- import sys
-
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint", "pytest_cov"]:
-- if not importlib.util.find_spec(module):
-- missing.append(module)
--if missing:
-- print(
-- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--
-
- os.environ["NO_COLOR"] = "1"
- pytest_plugins = ["ansiblelint.testing.fixtures"]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/
@ 2022-11-10 0:42 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-11-10 0:42 UTC (permalink / raw
To: gentoo-commits
commit: 09b921071f4a9f34515c93dafc591f1c61099c08
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 00:04:23 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 00:42:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b92107
app-admin/ansible-lint: add 6.8.6
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 1 +
app-admin/ansible-lint/ansible-lint-6.8.6.ebuild | 79 ++++++++++++++++++++++
.../ansible-lint-6.8.6_test-module-check.patch | 59 ++++++++++++++++
3 files changed, 139 insertions(+)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index a4e006f9827b..a03c12c2bcb8 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,4 @@
DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
DIST ansible-lint-6.7.0.gh.tar.gz 275573 BLAKE2B 56788efbd44f6c2d8f1dd946d26f4c784c5c9e077355823d143a7b95196a3b5ce672a987639da6f051832320585fe7106d92c293a0707c9886142eebdaa812f5 SHA512 39d5292c5d262a6ee6fe60b41d531d362c95b466fe28524d314c0f2554e50906db050df93c7dc6374b99e6ef283754844e08484d24570bbbaf637d08e0af4ae2
DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
+DIST ansible-lint-6.8.6.gh.tar.gz 293630 BLAKE2B aa43acb9cca21d3cdafebddb18d82781ab708d5696edc51567a8c56cc3eacb3bd96d08f97436eab54e69866f55fa6fc6537eb62e44e4d26eb3ee46ee13e7322d SHA512 0beb16ecff432444a25d3efa70f67eb55437faed593dfbb4bcaf080b06558403e711218f5a021268a2450ceeab1127d8dc8de027d1e4889350f20ca3d9ed9dca
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
new file mode 100644
index 000000000000..df6b0f93eebd
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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"
+SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+ >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
+ >=dev-python/ansible-compat-2.2.4[${PYTHON_USEDEP}]
+ >=dev-python/black-22.1.0[${PYTHON_USEDEP}]
+ dev-python/filelock[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-4.9.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-mock[${PYTHON_USEDEP}]
+ >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.8.6_test-module-check.patch
+)
+
+# Skip problematic tests:
+# - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
+# - similar problem with test_example_custom_module and 6.8.6
+# - test_call_from_outside_venv doesn't play nicely with the sandbox
+# - all the others require Internet access, mostly in order to access Ansible Galaxy
+EPYTEST_DESELECT=(
+ test/test_ansiblesyntax.py::test_null_tasks
+ test/test_cli_role_paths.py::test_run_playbook_github
+ test/test_eco.py
+ test/test_examples.py::test_example_custom_module
+ test/test_examples.py::test_custom_kinds
+ test/test_import_playbook.py::test_task_hook_import_playbook
+ test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+ test/test_list_rules.py::test_list_rules_with_format_option
+ test/test_list_rules.py::test_list_tags_includes_opt_in_rules
+ 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_profiles.py::test_profile_listing
+ test/test_rules_collection.py::test_rich_rule_listing
+ test/test_rules_collection.py::test_rules_id_format
+ test/test_skip_inside_yaml.py::test_role_meta
+ test/test_utils.py::test_cli_auto_detect
+ test/test_utils.py::test_template_lookup
+ test/test_verbosity.py::test_default_verbosity
+)
+
+distutils_enable_tests pytest
+
+# Test suite fails to start without this. Bug in the eclass, maybe?
+python_test() {
+ epytest test
+}
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
new file mode 100644
index 000000000000..5302a54cc32e
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
@@ -0,0 +1,59 @@
+--- a/conftest.py
++++ b/conftest.py
+@@ -7,56 +7,6 @@
+
+ import pytest
+
+-# checking if user is running pytest without installing test dependencies:
+-missing = []
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
+- if not importlib.util.find_spec(module):
+- missing.append(module)
+-if missing:
+- print(
+- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-# we need to be sure that we have the requirements installed as some tests
+-# might depend on these.
+-try:
+- from ansible_compat.prerun import get_cache_dir
+-
+- cache_dir = get_cache_dir(".")
+- subprocess.check_output(
+- [
+- "ansible-galaxy",
+- "collection",
+- "install",
+- "-p",
+- f"{cache_dir}/collections",
+- "-r",
+- "requirements.yml",
+- ],
+- stderr=subprocess.PIPE,
+- text=True,
+- )
+-except subprocess.CalledProcessError as exc:
+- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
+- sys.exit(1)
+-
+-# flake8: noqa: E402
+-from ansible.module_utils.common.yaml import ( # pylint: disable=wrong-import-position
+- HAS_LIBYAML,
+-)
+-
+-if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
+- # While presence of libyaml is not required for runtime, we keep this error
+- # fatal here in order to be sure that we spot libyaml errors during testing.
+- #
+- # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
+- print(
+- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-
+
+ os.environ["NO_COLOR"] = "1"
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/
@ 2023-03-06 22:06 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2023-03-06 22:06 UTC (permalink / raw
To: gentoo-commits
commit: ccf154cd02d6e9694d11a58dacab2f36598c34a2
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 22:05:00 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 22:06:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf154cd
app-admin/ansible-lint: drop 6.8.2, 6.9.1, 6.13.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 3 -
app-admin/ansible-lint/ansible-lint-6.13.1.ebuild | 55 ---------------
app-admin/ansible-lint/ansible-lint-6.8.2.ebuild | 80 ----------------------
app-admin/ansible-lint/ansible-lint-6.9.1.ebuild | 80 ----------------------
.../ansible-lint-6.8.1_test-module-check.patch | 43 ------------
.../ansible-lint-6.8.6_test-module-check.patch | 59 ----------------
6 files changed, 320 deletions(-)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 7db6dad18850..4aae424d1098 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,5 +1,2 @@
DIST ansible-lint-6.12.1.tar.gz 466371 BLAKE2B f43b3403c5d3db80d3ec3e3526cafc22bee68b31b5458e378a73bbec900de5411c597e9fc079a77cffc66a278a37bf0fc9ecfcaba3beccf74c6eecbe5b6148b9 SHA512 05c92c930d91419c212a9513aed5506c99e993acbce9437b6f8f3b95bd78ca5b0ff8e1a7d39f32907df72d858a2e4e6c74f47443c0f937b3644c7a18d1d59252
-DIST ansible-lint-6.13.1.tar.gz 488778 BLAKE2B d58002e10105759c6a19e8f67cccf6914cfb058573f7873bb6092bc3367c5af9583de30478c65e0d3b9b4840ac8103d688e6dc63e49543199b82447eba12eca0 SHA512 c71b45f3a73dd782480ae9c4c38fef5741297706d60d07c524f5abfb3249c87950bf8ffccd782a85ee6a83c357b1a0fbf101c659c640d98365d508dfb0a513a3
DIST ansible-lint-6.14.0.tar.gz 472203 BLAKE2B 041c7dbf0bc133423dc7f2a09c4f56b5b77e0bd46f86493a6e78748742ef930c9cb6d7525dcc72309b24b5f11e5ec135f967d56f079034f68ecba4da1a2dab03 SHA512 fd8546d4ba514c7979f6a194c992fee732046c0d0d3969a846689cc945a3f1cbe1798f3876883a664d7b9c2d0225ea27f3fd9fe30e2fdfc408afc4a028b91fdb
-DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
-DIST ansible-lint-6.9.1.gh.tar.gz 388343 BLAKE2B 73035bdbd6c1bdee5566d5dee5a8461953d99bbaf896d7a9764c32419e74c3d23883ac1a7548de3e21372195f99c325c371cead7397bf64d6d033d9a2f81ed01 SHA512 eaf255c53fb8355b06e7013f6676a09e2d7e67aa332306448f530c345925c80ff5ea54c580f7f6720a25ebed9e8deb4c0a8e4e22af4183e8a8ef7b6999be6099
diff --git a/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild
deleted file mode 100644
index ee2222e75df9..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~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-2.2.7[${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/pyyaml-5.4.1[${PYTHON_USEDEP}]
- >=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
- >=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}]
- >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
- >=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]
- dev-vcs/git"
-BDEPEND="
- >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- >=dev-python/pytest-plus-0.2[${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-6.8.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
deleted file mode 100644
index 622d56553866..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_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}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
- >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
- >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
- dev-python/black[${PYTHON_USEDEP}]
- >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
- dev-python/filelock[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-4.9.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.8.1_test-module-check.patch
-)
-
-# Skip problematic tests:
-# - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
-# - test_call_from_outside_venv doesn't play nicely with the sandbox
-# - all the others require Internet access, mostly in order to access Ansible Galaxy
-EPYTEST_DESELECT=(
- test/test_cli_role_paths.py::test_run_playbook_github
- test/test_eco.py
- test/test_examples.py::test_custom_kinds
- test/test_import_playbook.py::test_task_hook_import_playbook
- test/test_list_rules.py::test_list_rules_includes_opt_in_rules
- test/test_list_rules.py::test_list_rules_with_format_option
- test/test_list_rules.py::test_list_tags_includes_opt_in_rules
- 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_profiles.py::test_profile_listing
- test/test_rules_collection.py::test_rich_rule_listing
- test/test_rules_collection.py::test_rules_id_format
- test/test_skip_inside_yaml.py::test_role_meta
- test/test_utils.py::test_cli_auto_detect
- test/test_utils.py::test_template_lookup
- test/test_verbosity.py::test_default_verbosity
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- # Since 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
-}
diff --git a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
deleted file mode 100644
index 5e650d086a23..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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"
-SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
- >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
- >=dev-python/ansible-compat-2.2.5[${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/pyyaml-5.4.1[${PYTHON_USEDEP}]
- >=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
- >=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}]
- >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
- >=dev-util/yamllint-1.26.3[${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-mock[${PYTHON_USEDEP}]
- >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.8.6_test-module-check.patch
-)
-
-# Skip problematic tests:
-# - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
-# - test_call_from_outside_venv doesn't play nicely with the sandbox
-# - all the others require Internet access, mostly in order to access Ansible Galaxy
-EPYTEST_DESELECT=(
- test/test_ansiblesyntax.py::test_null_tasks
- test/test_cli_role_paths.py::test_run_playbook_github
- test/test_eco.py
- test/test_examples.py::test_custom_kinds
- test/test_examples.py::test_example
- test/test_file_path_evaluation.py
- test/test_import_playbook.py::test_task_hook_import_playbook
- test/test_list_rules.py::test_list_rules_includes_opt_in_rules
- test/test_list_rules.py::test_list_rules_with_format_option
- test/test_list_rules.py::test_list_tags_includes_opt_in_rules
- 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_profiles.py::test_profile_listing
- test/test_rules_collection.py::test_rich_rule_listing
- test/test_rules_collection.py::test_rules_id_format
- test/test_schemas.py::test_refresh_schemas
- test/test_skip_inside_yaml.py::test_role_meta
- test/test_utils.py::test_cli_auto_detect
- test/test_utils.py::test_template_lookup
- test/test_verbosity.py::test_default_verbosity
-)
-
-distutils_enable_tests pytest
-
-# Test suite fails to start without this. Bug in the eclass, maybe?
-python_test() {
- epytest test
-}
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
deleted file mode 100644
index 8c2ca1a96503..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/conftest.py
-+++ b/conftest.py
-@@ -8,40 +8,6 @@
- import pytest
- from ansible.module_utils.common.yaml import HAS_LIBYAML
-
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
-- if not importlib.util.find_spec(module):
-- missing.append(module)
--if missing:
-- print(
-- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--# we need to be sure that we have the requirements installed as some tests
--# might depend on these.
--try:
-- subprocess.check_output(
-- ["ansible-galaxy", "collection", "install", "-r", "requirements.yml"],
-- stderr=subprocess.PIPE,
-- text=True,
-- )
--except subprocess.CalledProcessError as exc:
-- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
-- sys.exit(1)
--
--if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
-- # While presence of libyaml is not required for runtime, we keep this error
-- # fatal here in order to be sure that we spot libyaml errors during testing.
-- #
-- # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
-- print(
-- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--
-
- os.environ["NO_COLOR"] = "1"
-
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
deleted file mode 100644
index 5302a54cc32e..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/conftest.py
-+++ b/conftest.py
-@@ -7,56 +7,6 @@
-
- import pytest
-
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
-- if not importlib.util.find_spec(module):
-- missing.append(module)
--if missing:
-- print(
-- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--# we need to be sure that we have the requirements installed as some tests
--# might depend on these.
--try:
-- from ansible_compat.prerun import get_cache_dir
--
-- cache_dir = get_cache_dir(".")
-- subprocess.check_output(
-- [
-- "ansible-galaxy",
-- "collection",
-- "install",
-- "-p",
-- f"{cache_dir}/collections",
-- "-r",
-- "requirements.yml",
-- ],
-- stderr=subprocess.PIPE,
-- text=True,
-- )
--except subprocess.CalledProcessError as exc:
-- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
-- sys.exit(1)
--
--# flake8: noqa: E402
--from ansible.module_utils.common.yaml import ( # pylint: disable=wrong-import-position
-- HAS_LIBYAML,
--)
--
--if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
-- # While presence of libyaml is not required for runtime, we keep this error
-- # fatal here in order to be sure that we spot libyaml errors during testing.
-- #
-- # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
-- print(
-- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--
-
- os.environ["NO_COLOR"] = "1"
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-06 22:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-21 18:33 [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/files/, app-admin/ansible-lint/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2023-03-06 22:06 Marek Szuba
2022-11-10 0:42 Marek Szuba
2022-09-02 0:48 Marek Szuba
2022-04-01 8:18 Marek Szuba
2020-02-10 13:29 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox