From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- app-admin/ansible-lint/Manifest | 9 +- app-admin/ansible-lint/ansible-lint-4.0.1.ebuild | 37 ----- app-admin/ansible-lint/ansible-lint-4.1.0.ebuild | 39 ----- app-admin/ansible-lint/ansible-lint-5.0.12.ebuild | 38 +++++ app-admin/ansible-lint/ansible-lint-5.0.2.ebuild | 37 ----- ...-lint-4.1.0-specifierset-split-setuptools.patch | 175 --------------------- 6 files changed, 40 insertions(+), 295 deletions(-) delete mode 100644 app-admin/ansible-lint/ansible-lint-4.0.1.ebuild delete mode 100644 app-admin/ansible-lint/ansible-lint-4.1.0.ebuild create mode 100644 app-admin/ansible-lint/ansible-lint-5.0.12.ebuild delete mode 100644 app-admin/ansible-lint/ansible-lint-5.0.2.ebuild delete mode 100644 app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch (limited to 'app-admin/ansible-lint') diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 0ec4e23ca331..bd4af07c45ff 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,8 +1,3 @@ -AUX ansible-lint-4.1.0-specifierset-split-setuptools.patch 6509 BLAKE2B a2d9fe19d160a13213d822a195969e12b5f18843b2784c3d06460511867ee7b0198282888c945b37649f487d5e08d10a4c26ae808da11cb269cdc980db09287c SHA512 d2e79ec9dfb330182fae18f26bf0461c49e7c80d86ce65cbada672d70d69176a8880f4eae4125b2343a48ae0b793722a44aeebb3f4a7da99dd2fa44c4b67af29 -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 -EBUILD ansible-lint-4.0.1.ebuild 982 BLAKE2B 4b4c71695539664cae4c204f35293ebd712c8d1947eedfe261a560e8b0f8184c5bcb94158b92f1654c5b01d3131fef9697cda7f1429263de966e5c8e15b0310c SHA512 3359b75407319aff4d06fcd443970eeeb4026511954b960c4cf62ee0459f3966288597397a4df5a12321f28ab63cb218d9113be503061e79309af52ce99716eb -EBUILD ansible-lint-4.1.0.ebuild 1095 BLAKE2B c7bd5983f57c13b6252ce364fdb0e530ce6047b21f457ef1a52e89ec1053ee4b9e3d5c534689b45f892d842f0916e1f297444b92e6c93de29812632d3d93fbb6 SHA512 5c37f79ad5c6bf693c2c336d1fe4c4d8634a81492a9d61dc9da3e724577fff6b7c01e491c89585d3087c11c43ff7c152f33bf74cb418254d1a8e67252d9beb21 -EBUILD ansible-lint-5.0.2.ebuild 995 BLAKE2B 1a19bad671eb71988062c7316e761a3ef4cfebcb82a00d8c5701777627308ebb85609091ab6a4ed3799edaf09fb7b3aaad91745ea76e2316ad2672fafaa2b07e SHA512 b1ffd4c241e1a2fb3bc262af9780d322766936d02e8daeecab9c2dea9eb17a01c0bdd8809b4c8e98c748d97ca3983be4c554013e71e99a630111a8bbdca384cb +DIST ansible-lint-5.0.12.tar.gz 348478 BLAKE2B 3ea2a0adb82bd21322fa9a2d4c8dd4f41345f909401341748e8395aa8acf92bfc8058ee679a594c886327480bb808e69622e874c9def97c406265a0828a314eb SHA512 06b84d098253ab70f9c3fb59e1d2ba4d30918f1e7c6f3decc8f73fe8cdb7d697527eff3efcc7238fc952bc07b7179d37582d5fb9968e691e2df5495741802404 +EBUILD ansible-lint-5.0.12.ebuild 1034 BLAKE2B 82f232255a8d6566b9f04b643ceb29d58aaf0fb86ac1e6fa22c902dfb307529617b2dfa3c6d4adcf51182888af4e809d0212226dbdae9d87466b41175b7e4a74 SHA512 8507cf813ac8fb69ed9602a1e9020e2f7bd86e795be34cf615273e30cb08f92c1ea787cce69dc1167e93600eb0f5581415c07fc9f65c42d079287016edd159f9 MISC metadata.xml 468 BLAKE2B 9a19ffcfb424cdc3bb4bbe624636b57f2b990c39e8925ebd2b88d3b42087ab0755566a5bea902385873ab7479ae21971345f65d9b30039469757e5382e71da2d SHA512 cfaa5f72f5a621d074859821f6c11b1cc8f0c3be1bfdb09262835a8e2b3be2e55fb0e1e2eff756097e1583d11f63c5771d8c79f51d67e001f3d95f2fb4553a25 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 e132b13291f9..000000000000 --- 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 e7c7f73865ed..000000000000 --- 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/ansible-lint-5.0.12.ebuild b/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild new file mode 100644 index 000000000000..32408b53d62f --- /dev/null +++ b/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +# tests are broken at the moment +RESTRICT="test" + +RDEPEND=" + app-admin/ansible[${PYTHON_USEDEP}] + dev-python/enrich[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/tenacity[${PYTHON_USEDEP}] + dev-python/wcmatch[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] + test? ( + dev-python/flake8[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" + +distutils_enable_tests nose diff --git a/app-admin/ansible-lint/ansible-lint-5.0.2.ebuild b/app-admin/ansible-lint/ansible-lint-5.0.2.ebuild deleted file mode 100644 index 1669284dd5aa..000000000000 --- a/app-admin/ansible-lint/ansible-lint-5.0.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -# tests are broken at the moment -RESTRICT="test" - -RDEPEND=" - app-admin/ansible[${PYTHON_USEDEP}] - dev-python/enrich[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wcmatch[${PYTHON_USEDEP}]" -BDEPEND=" - dev-python/ruamel-yaml[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - test? ( - dev-python/flake8[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -distutils_enable_tests nose 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 4e4ac16d2389..000000000000 --- 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 -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, -+ } - } - - -- cgit v1.2.3