1 |
commit: 5ba994476880e08472fc4569583de5ceb72d6352 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 26 00:40:59 2022 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 26 01:01:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba99447 |
7 |
|
8 |
app-admin/ansible-molecule: drop 3.5.2-r1 |
9 |
|
10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
11 |
|
12 |
app-admin/ansible-molecule/Manifest | 1 - |
13 |
.../ansible-molecule-3.5.2-r1.ebuild | 90 ---------------------- |
14 |
.../files/ansible-molecule-3.5.2_pyyaml6.patch | 11 --- |
15 |
3 files changed, 102 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest |
18 |
index 838c6e6b4a11..e3f14924e7cc 100644 |
19 |
--- a/app-admin/ansible-molecule/Manifest |
20 |
+++ b/app-admin/ansible-molecule/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST ansible-molecule-4.0.1.tar.gz 301517 BLAKE2B 73cf7a2257368c737b9003236bf77011de167dd6f692166702e7948c136202b33bcce1c70893b61a95af9baa90e7b5266a5fa889e3bba0e5a8c9c1e6f48fec9a SHA512 7515e07bf791d5586e1f5fb4ce0d2f731c94c8268c589155340b2bdc1528534084870e66e492b2d883f9e9764293c93799a4c75478523502a2f37ad0642a472d |
23 |
-DIST molecule-3.5.2.tar.gz 290964 BLAKE2B b6c6bb8ecdb4230d23161e25fa003c8979f48fc1705bfba7d14204fbaa3e9c235a71db0c4ccbab5c4328ddb8a0725d3c2ba7cb4b624afda21c6453c8be824f3e SHA512 04a7d1f7e7e098c0ada71d8dc9a3e3a94320033942d8ee03f2c51ec185405d2ee13fcb44000a4942ec66923f0426717ab7e2c3a785ddda7a23515096474dc3c3 |
24 |
|
25 |
diff --git a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild b/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild |
26 |
deleted file mode 100644 |
27 |
index 2a2c00db61e6..000000000000 |
28 |
--- a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,90 +0,0 @@ |
31 |
-# Copyright 1999-2022 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=8 |
35 |
- |
36 |
-PYTHON_COMPAT=( python3_{8..10} ) |
37 |
-DISTUTILS_SINGLE_IMPL=1 |
38 |
- |
39 |
-inherit distutils-r1 optfeature |
40 |
- |
41 |
-MY_PN="${PN#ansible-}" |
42 |
-MY_P="${MY_PN}-${PV}" |
43 |
- |
44 |
-DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles" |
45 |
-HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/" |
46 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
47 |
- |
48 |
-LICENSE="MIT" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~amd64 ~riscv" |
51 |
-IUSE="selinux" |
52 |
- |
53 |
-RDEPEND="$(python_gen_cond_dep ' |
54 |
- >=dev-python/ansible-compat-0.5.0[${PYTHON_USEDEP}] |
55 |
- <dev-python/cerberus-1.3.3[${PYTHON_USEDEP}] |
56 |
- >=dev-python/click-8.0[${PYTHON_USEDEP}] |
57 |
- >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}] |
58 |
- >=dev-python/enrich-1.2.5[${PYTHON_USEDEP}] |
59 |
- >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}] |
60 |
- dev-python/packaging[${PYTHON_USEDEP}] |
61 |
- <dev-python/paramiko-3[${PYTHON_USEDEP}] |
62 |
- <dev-python/pluggy-2.0[${PYTHON_USEDEP}] |
63 |
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] |
64 |
- >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] |
65 |
- >=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}] |
66 |
- >=dev-util/cookiecutter-1.7.3[${PYTHON_USEDEP}] |
67 |
- selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] ) |
68 |
-')" |
69 |
-BDEPEND="$(python_gen_cond_dep ' |
70 |
- >=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}] |
71 |
- >=dev-python/setuptools_scm_git_archive-1.1[${PYTHON_USEDEP}] |
72 |
- doc? ( |
73 |
- dev-python/ansible-pygments[${PYTHON_USEDEP}] |
74 |
- >=dev-python/simplejson-3.17.2[${PYTHON_USEDEP}] |
75 |
- ) |
76 |
- test? ( |
77 |
- >=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}] |
78 |
- <dev-python/pexpect-5[${PYTHON_USEDEP}] |
79 |
- >=dev-python/pytest-html-3.0.0[${PYTHON_USEDEP}] |
80 |
- >=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}] |
81 |
- >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] |
82 |
- >=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}] |
83 |
- >=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}] |
84 |
- dev-util/yamllint |
85 |
- ) |
86 |
-')" |
87 |
- |
88 |
-PATCHES=( |
89 |
- "${FILESDIR}"/${PN}-3.5.2_pyyaml6.patch |
90 |
-) |
91 |
- |
92 |
-S="${WORKDIR}"/${MY_P} |
93 |
- |
94 |
-distutils_enable_sphinx docs '>=dev-python/sphinx-notfound-page-0.7.1' '<dev-python/sphinx_ansible_theme-0.9.0' |
95 |
-distutils_enable_tests --install pytest |
96 |
- |
97 |
-src_prepare() { |
98 |
- default |
99 |
- |
100 |
- if ! use selinux; then |
101 |
- sed -i "/^\s\+selinux/d" setup.cfg || die "Failed to remove dependency on SELinux" |
102 |
- fi |
103 |
- |
104 |
- # Several issues with tests from this file: |
105 |
- # - quite a few of these use the network; |
106 |
- # - test_command_dependency[shell] only works if Molecule has previously been installed; |
107 |
- # - tests involving creation of a new scenario fail on ansible-lint errors, even though |
108 |
- # a config file is deployed which should skip expected issues. |
109 |
- rm -f src/molecule/test/functional/test_command.py |
110 |
-} |
111 |
- |
112 |
-python_test() { |
113 |
- distutils_install_for_testing --via-venv |
114 |
- distutils-r1_python_test |
115 |
-} |
116 |
- |
117 |
-pkg_postinst() { |
118 |
- optfeature_header "Some optional packages commonly used in Molecule scenarios:" |
119 |
- optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint |
120 |
-} |
121 |
|
122 |
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch b/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch |
123 |
deleted file mode 100644 |
124 |
index 80a7d8b7a87d..000000000000 |
125 |
--- a/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch |
126 |
+++ /dev/null |
127 |
@@ -1,11 +0,0 @@ |
128 |
---- a/setup.cfg |
129 |
-+++ b/setup.cfg |
130 |
-@@ -74,7 +74,7 @@ |
131 |
- packaging |
132 |
- paramiko >= 2.5.0, < 3 |
133 |
- pluggy >= 0.7.1, < 2.0 |
134 |
-- PyYAML >= 5.1, < 6 |
135 |
-+ PyYAML >= 5.1 |
136 |
- rich >= 9.5.1 |
137 |
- subprocess-tee >= 0.3.5 |
138 |
- selinux; sys_platform=="linux2" |