1 |
commit: aa82faffb4ab9792aa023d1c783cd67c08cc0b75 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 31 19:55:09 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 31 20:18:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa82faff |
7 |
|
8 |
app-admin/ansible-lint: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-admin/ansible-lint/Manifest | 2 - |
13 |
app-admin/ansible-lint/ansible-lint-4.0.1.ebuild | 37 ----- |
14 |
app-admin/ansible-lint/ansible-lint-4.1.0.ebuild | 39 ----- |
15 |
...-lint-4.1.0-specifierset-split-setuptools.patch | 175 --------------------- |
16 |
4 files changed, 253 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest |
19 |
index 55b0c06e279..60c420a7fa7 100644 |
20 |
--- a/app-admin/ansible-lint/Manifest |
21 |
+++ b/app-admin/ansible-lint/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4 |
24 |
-DIST ansible-lint-4.1.0.tar.gz 2911091 BLAKE2B b6e414dbdeebcc1cae900736829abf2db0930e5e05ae7c2bbd6d30a89b6ac28485ddfb63528bdc3baae6ef97ae7536507632d43b16f9a16dd86887d781940aeb SHA512 c1d07093d68bf5f43c20c3a999adf26d23ba587d5008a35069dcbab514b208737f5d0ecaf032e43d313233ea06193db81b349d5fb62f3ac684af9e51d8bc6e08 |
25 |
DIST ansible-lint-5.0.2.tar.gz 331359 BLAKE2B e86a1bce18d3a04fa4d895e9f8650f6853d706588bcfa564ee8245a63a6779cc00737351807d0bc3fdd624c348275afda15d3834faa2efd01b2383115864f7a6 SHA512 760da7574db68d351a4a834d7963840ebe61c72df62db220f2c3e894f0906a193783821823621f64eb7d2f16f6f226f748ff03f068beb14fa43ca009ab0df539 |
26 |
|
27 |
diff --git a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild |
28 |
deleted file mode 100644 |
29 |
index e132b13291f..00000000000 |
30 |
--- a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,37 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-PYTHON_COMPAT=( python3_7 ) |
39 |
- |
40 |
-inherit distutils-r1 |
41 |
- |
42 |
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" |
43 |
-HOMEPAGE="https://github.com/ansible/ansible-lint" |
44 |
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="MIT" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64" |
49 |
-IUSE="test" |
50 |
-RESTRICT="!test? ( test )" |
51 |
- |
52 |
-CDEPEND="app-admin/ansible[${PYTHON_USEDEP}] |
53 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
54 |
- dev-python/six[${PYTHON_USEDEP}]" |
55 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
56 |
- dev-python/setuptools-git[${PYTHON_USEDEP}] |
57 |
- dev-python/setuptools_scm[${PYTHON_USEDEP}] |
58 |
- dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] |
59 |
- test? ( |
60 |
- dev-python/flake8[${PYTHON_USEDEP}] |
61 |
- dev-python/nose[${PYTHON_USEDEP}] |
62 |
- dev-python/wheel[${PYTHON_USEDEP}] |
63 |
- ) |
64 |
- ${CDEPEND}" |
65 |
-RDEPEND="${CDEPEND}" |
66 |
- |
67 |
-python_test() { |
68 |
- nosetests || die |
69 |
-} |
70 |
|
71 |
diff --git a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild |
72 |
deleted file mode 100644 |
73 |
index e7c7f73865e..00000000000 |
74 |
--- a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild |
75 |
+++ /dev/null |
76 |
@@ -1,39 +0,0 @@ |
77 |
-# Copyright 1999-2020 Gentoo Authors |
78 |
-# Distributed under the terms of the GNU General Public License v2 |
79 |
- |
80 |
-EAPI=7 |
81 |
- |
82 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
83 |
-PYTHON_COMPAT=( python3_7 ) |
84 |
- |
85 |
-inherit distutils-r1 |
86 |
- |
87 |
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" |
88 |
-HOMEPAGE="https://github.com/ansible-community/ansible-lint" |
89 |
-SRC_URI="https://github.com/ansible-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
90 |
- |
91 |
-LICENSE="MIT" |
92 |
-SLOT="0" |
93 |
-KEYWORDS="~amd64" |
94 |
-IUSE="test" |
95 |
-RESTRICT="!test? ( test )" |
96 |
-PATCHES="${FILESDIR}/${P}-specifierset-split-setuptools.patch" |
97 |
- |
98 |
-CDEPEND="app-admin/ansible[${PYTHON_USEDEP}] |
99 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
100 |
- dev-python/six[${PYTHON_USEDEP}]" |
101 |
-DEPEND="dev-python/ruamel-yaml[${PYTHON_USEDEP}] |
102 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
103 |
- dev-python/setuptools_scm[${PYTHON_USEDEP}] |
104 |
- dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] |
105 |
- test? ( |
106 |
- dev-python/flake8[${PYTHON_USEDEP}] |
107 |
- dev-python/nose[${PYTHON_USEDEP}] |
108 |
- dev-python/wheel[${PYTHON_USEDEP}] |
109 |
- ) |
110 |
- ${CDEPEND}" |
111 |
-RDEPEND="${CDEPEND}" |
112 |
- |
113 |
-python_test() { |
114 |
- nosetests || die |
115 |
-} |
116 |
|
117 |
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 |
118 |
deleted file mode 100644 |
119 |
index 4e4ac16d238..00000000000 |
120 |
--- a/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch |
121 |
+++ /dev/null |
122 |
@@ -1,175 +0,0 @@ |
123 |
-From c91d23b2f82b4efb540168132842b243eb2d8b0d Mon Sep 17 00:00:00 2001 |
124 |
-From: Sviatoslav Sydorenko <wk@×××××××××××××.ua> |
125 |
-Date: Thu, 24 Oct 2019 01:38:35 +0200 |
126 |
-Subject: [PATCH] Drop support for setuptools older than 34.4.0 |
127 |
- |
128 |
-Resolves #599 |
129 |
---- |
130 |
- setup.py | 141 +++++-------------------------------------------------- |
131 |
- 1 file changed, 13 insertions(+), 128 deletions(-) |
132 |
- |
133 |
-diff --git a/setup.py b/setup.py |
134 |
-index 25cc9e80d09e4657b56c4c4ed68d9411b7d7eae9..ff4c5bd65a7f5786c5af32750fb83dd3f6d92cec 100644 |
135 |
---- a/setup.py |
136 |
-+++ b/setup.py |
137 |
-@@ -1,138 +1,16 @@ |
138 |
- #! /usr/bin/env python |
139 |
- """Ansible-lint distribution package setuptools installer.""" |
140 |
- |
141 |
--import setuptools |
142 |
-- |
143 |
-- |
144 |
--try: |
145 |
-- from setuptools.config import read_configuration, ConfigOptionsHandler |
146 |
-- import setuptools.config |
147 |
-- import setuptools.dist |
148 |
-- |
149 |
-- # Set default value for 'use_scm_version' |
150 |
-- setattr(setuptools.dist.Distribution, 'use_scm_version', False) |
151 |
-- |
152 |
-- # Attach bool parser to 'use_scm_version' option |
153 |
-- class ShimConfigOptionsHandler(ConfigOptionsHandler): |
154 |
-- """Extension class for ConfigOptionsHandler.""" |
155 |
-- |
156 |
-- @property |
157 |
-- def parsers(self): |
158 |
-- """Return an option mapping with default data type parsers.""" |
159 |
-- _orig_parsers = super(ShimConfigOptionsHandler, self).parsers |
160 |
-- return dict(use_scm_version=self._parse_bool, **_orig_parsers) |
161 |
-- |
162 |
-- setuptools.config.ConfigOptionsHandler = ShimConfigOptionsHandler |
163 |
--except ImportError: |
164 |
-- """This is a shim for setuptools<30.3.""" |
165 |
-- import io |
166 |
-- import json |
167 |
-- |
168 |
-- try: |
169 |
-- from configparser import ConfigParser, NoSectionError |
170 |
-- except ImportError: |
171 |
-- from ConfigParser import ConfigParser, NoSectionError |
172 |
-- ConfigParser.read_file = ConfigParser.readfp |
173 |
-- |
174 |
-- def maybe_read_files(d): |
175 |
-- """Read files if the string starts with `file:` marker.""" |
176 |
-- d = d.strip() |
177 |
-- if not d.startswith('file:'): |
178 |
-- return d |
179 |
-- descs = [] |
180 |
-- for fname in map(str.strip, str(d[5:]).split(',')): |
181 |
-- with io.open(fname, encoding='utf-8') as f: |
182 |
-- descs.append(f.read()) |
183 |
-- return ''.join(descs) |
184 |
-- |
185 |
-- def cfg_val_to_list(v): |
186 |
-- """Turn config val to list and filter out empty lines.""" |
187 |
-- return list(filter(bool, map(str.strip, str(v).strip().splitlines()))) |
188 |
- |
189 |
-- def cfg_val_to_dict(v): |
190 |
-- """Turn config val to dict and filter out empty lines.""" |
191 |
-- return dict( |
192 |
-- map(lambda l: list(map(str.strip, l.split('=', 1))), |
193 |
-- filter(bool, map(str.strip, str(v).strip().splitlines()))) |
194 |
-- ) |
195 |
-+__requires__ = ('setuptools >= 34.4', ) |
196 |
- |
197 |
-- def cfg_val_to_primitive(v): |
198 |
-- """Parse primitive config val to appropriate data type.""" |
199 |
-- return json.loads(v.strip().lower()) |
200 |
- |
201 |
-- def read_configuration(filepath): |
202 |
-- """Read metadata and options from setup.cfg located at filepath.""" |
203 |
-- cfg = ConfigParser() |
204 |
-- with io.open(filepath, encoding='utf-8') as f: |
205 |
-- cfg.read_file(f) |
206 |
-- |
207 |
-- md = dict(cfg.items('metadata')) |
208 |
-- for list_key in 'classifiers', 'keywords': |
209 |
-- try: |
210 |
-- md[list_key] = cfg_val_to_list(md[list_key]) |
211 |
-- except KeyError: |
212 |
-- pass |
213 |
-- try: |
214 |
-- md['long_description'] = maybe_read_files(md['long_description']) |
215 |
-- except KeyError: |
216 |
-- pass |
217 |
-- opt = dict(cfg.items('options')) |
218 |
-- for list_key in 'use_scm_version', 'zip_safe': |
219 |
-- try: |
220 |
-- opt[list_key] = cfg_val_to_primitive(opt[list_key]) |
221 |
-- except KeyError: |
222 |
-- pass |
223 |
-- for list_key in 'scripts', 'install_requires', 'setup_requires': |
224 |
-- try: |
225 |
-- opt[list_key] = cfg_val_to_list(opt[list_key]) |
226 |
-- except KeyError: |
227 |
-- pass |
228 |
-- try: |
229 |
-- opt['package_dir'] = cfg_val_to_dict(opt['package_dir']) |
230 |
-- except KeyError: |
231 |
-- pass |
232 |
-- try: |
233 |
-- opt_package_data = dict(cfg.items('options.package_data')) |
234 |
-- if not opt_package_data.get('', '').strip(): |
235 |
-- opt_package_data[''] = opt_package_data['*'] |
236 |
-- del opt_package_data['*'] |
237 |
-- except (KeyError, NoSectionError): |
238 |
-- opt_package_data = {} |
239 |
-- try: |
240 |
-- opt_extras_require = dict(cfg.items('options.extras_require')) |
241 |
-- opt['extras_require'] = {} |
242 |
-- for k, v in opt_extras_require.items(): |
243 |
-- opt['extras_require'][k] = cfg_val_to_list(v) |
244 |
-- except NoSectionError: |
245 |
-- pass |
246 |
-- opt['package_data'] = {} |
247 |
-- for k, v in opt_package_data.items(): |
248 |
-- opt['package_data'][k] = cfg_val_to_list(v) |
249 |
-- cur_pkgs = opt.get('packages', '').strip() |
250 |
-- if '\n' in cur_pkgs: |
251 |
-- opt['packages'] = cfg_val_to_list(opt['packages']) |
252 |
-- elif cur_pkgs.startswith('find:'): |
253 |
-- opt_packages_find = dict(cfg.items('options.packages.find')) |
254 |
-- opt['packages'] = setuptools.find_packages(**opt_packages_find) |
255 |
-- return {'metadata': md, 'options': opt} |
256 |
-- |
257 |
-- |
258 |
--setup_params = {} |
259 |
--declarative_setup_params = read_configuration('setup.cfg') |
260 |
-- |
261 |
--# Patch incorrectly decoded package_dir option |
262 |
--# ``egg_info`` demands native strings failing with unicode under Python 2 |
263 |
--# Ref https://github.com/pypa/setuptools/issues/1136 |
264 |
--declarative_setup_params['options']['package_dir'] = { |
265 |
-- str(k): str(v) |
266 |
-- for k, v in declarative_setup_params['options']['package_dir'].items() |
267 |
--} |
268 |
-- |
269 |
--setup_params = dict(setup_params, **declarative_setup_params['metadata']) |
270 |
--setup_params = dict(setup_params, **declarative_setup_params['options']) |
271 |
-+import setuptools |
272 |
-+from setuptools.config import read_configuration |
273 |
- |
274 |
- |
275 |
- def cut_local_version_on_upload(version): |
276 |
-+ """Generate a PEP440 local version if uploading to PyPI.""" |
277 |
- import os |
278 |
- import setuptools_scm.version # only present during setup time |
279 |
- IS_PYPI_UPLOAD = os.getenv('PYPI_UPLOAD') == 'true' |
280 |
-@@ -142,8 +20,15 @@ def cut_local_version_on_upload(version): |
281 |
- ) |
282 |
- |
283 |
- |
284 |
--setup_params['use_scm_version'] = { |
285 |
-- 'local_scheme': cut_local_version_on_upload, |
286 |
-+# This is needed because even new |
287 |
-+# setuptools don't parse |
288 |
-+# `setup_requires` from `setup.cfg`: |
289 |
-+declarative_setup_params = read_configuration('setup.cfg') |
290 |
-+setup_params = { |
291 |
-+ 'setup_requires': declarative_setup_params['options']['setup_requires'], |
292 |
-+ 'use_scm_version': { |
293 |
-+ 'local_scheme': cut_local_version_on_upload, |
294 |
-+ } |
295 |
- } |
296 |
- |
297 |
- |