* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/, app-admin/ansible-lint/files/
@ 2021-05-31 20:18 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-05-31 20:18 UTC (permalink / raw
To: gentoo-commits
commit: aa82faffb4ab9792aa023d1c783cd67c08cc0b75
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 19:55:09 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 31 20:18:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa82faff
app-admin/ansible-lint: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 2 -
app-admin/ansible-lint/ansible-lint-4.0.1.ebuild | 37 -----
app-admin/ansible-lint/ansible-lint-4.1.0.ebuild | 39 -----
...-lint-4.1.0-specifierset-split-setuptools.patch | 175 ---------------------
4 files changed, 253 deletions(-)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 55b0c06e279..60c420a7fa7 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1 @@
-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
DIST ansible-lint-5.0.2.tar.gz 331359 BLAKE2B e86a1bce18d3a04fa4d895e9f8650f6853d706588bcfa564ee8245a63a6779cc00737351807d0bc3fdd624c348275afda15d3834faa2efd01b2383115864f7a6 SHA512 760da7574db68d351a4a834d7963840ebe61c72df62db220f2c3e894f0906a193783821823621f64eb7d2f16f6f226f748ff03f068beb14fa43ca009ab0df539
diff --git a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
deleted file mode 100644
index e132b13291f..00000000000
--- a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_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 )"
-
-CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/setuptools-git[${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/ansible-lint-4.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
deleted file mode 100644
index e7c7f73865e..00000000000
--- a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible-community/ansible-lint"
-SRC_URI="https://github.com/ansible-community/${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
deleted file mode 100644
index 4e4ac16d238..00000000000
--- a/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-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] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/, app-admin/ansible-lint/files/
@ 2022-10-13 9:47 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2022-10-13 9:47 UTC (permalink / raw
To: gentoo-commits
commit: e0d3330271f1fc33cd4e500757f9874d9c8415ec
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 09:46:26 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 09:46:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d33302
app-admin/ansible-lint: add 6.8.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 1 +
app-admin/ansible-lint/ansible-lint-6.8.1.ebuild | 80 ++++++++++++++++++++++
.../ansible-lint-6.8.1_test-module-check.patch | 43 ++++++++++++
3 files changed, 124 insertions(+)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index f9eaa3509efc..a06483ebca57 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,2 +1,3 @@
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.1.gh.tar.gz 287839 BLAKE2B 21421d7254a63b1460ce3f36529967a988c2835761f7ff1973b62c3210fffabc0eb95ede09fc5e582586782f7e258bd0b7534cf786671bc628631bf8d815644c SHA512 cd368d568f33a9711299b8a563f99f3d5eb6bed8334cb63e60fa43239716013a7d47e42e059c521a687d2e7cfc4c6d60621f1123050428f9ede0865c60d3ace0
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.1.ebuild
new file mode 100644
index 000000000000..1632b2104f54
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-6.8.1.ebuild
@@ -0,0 +1,80 @@
+# 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.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/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
new file mode 100644
index 000000000000..8c2ca1a96503
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
@@ -0,0 +1,43 @@
+--- 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"
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/, app-admin/ansible-lint/files/
@ 2022-11-10 0:42 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2022-11-10 0:42 UTC (permalink / raw
To: gentoo-commits
commit: 98884e9992a796a54b3281b0730ff206826ed7fc
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 00:05:35 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 00:42:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98884e99
app-admin/ansible-lint: drop 6.5.2, 6.7.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-lint/Manifest | 2 -
app-admin/ansible-lint/ansible-lint-6.5.2.ebuild | 78 ----------------------
app-admin/ansible-lint/ansible-lint-6.7.0.ebuild | 78 ----------------------
.../ansible-lint-6.5.2_test-module-check.patch | 32 ---------
.../ansible-lint-6.6.1_test-module-check.patch | 32 ---------
5 files changed, 222 deletions(-)
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index a03c12c2bcb8..e240d969041e 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,4 +1,2 @@
-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.5.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
deleted file mode 100644
index 71e510a4133d..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
+++ /dev/null
@@ -1,78 +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.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.5.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_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.7.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild
deleted file mode 100644
index a483735e3a30..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild
+++ /dev/null
@@ -1,78 +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.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.6.1_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_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/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
deleted file mode 100644
index 8e6cb512b633..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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"
-
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch
deleted file mode 100644
index 0f6e9aadde9e..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/conftest.py
-+++ b/conftest.py
-@@ -7,29 +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 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] 3+ messages in thread
end of thread, other threads:[~2022-11-10 0:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-13 9:47 [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-lint/, app-admin/ansible-lint/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2022-11-10 0:42 Marek Szuba
2021-05-31 20:18 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox