* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/, app-admin/ansible-molecule/files/
@ 2021-11-26 9:16 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2021-11-26 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 9f3fe052899954cb779b76434f8796f726c716a0
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 09:09:54 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 09:16:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3fe052
app-admin/ansible-molecule: remove pyyaml version cap from setup.cfg
I haven't been able to reproduce this on any of my systems (yes,
including outside Docker this time) but as ago's tinderbox shows,
version caps from setup.cfg _can_ sometimes be honoured.
Closes: https://bugs.gentoo.org/827362
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild | 4 ++++
.../files/ansible-molecule-3.5.2_pyyaml6.patch | 11 +++++++++++
2 files changed, 15 insertions(+)
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
index 21dc93e1196d..90b97115e875 100644
--- a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
@@ -54,6 +54,10 @@ BDEPEND="$(python_gen_cond_dep '
)
')"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.2_pyyaml6.patch
+)
+
S="${WORKDIR}"/${MY_P}
distutils_enable_sphinx docs '>=dev-python/sphinx-notfound-page-0.7.1' '<dev-python/sphinx_ansible_theme-0.9.0'
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
new file mode 100644
index 000000000000..80a7d8b7a87d
--- /dev/null
+++ b/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch
@@ -0,0 +1,11 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -74,7 +74,7 @@
+ packaging
+ paramiko >= 2.5.0, < 3
+ pluggy >= 0.7.1, < 2.0
+- PyYAML >= 5.1, < 6
++ PyYAML >= 5.1
+ rich >= 9.5.1
+ subprocess-tee >= 0.3.5
+ selinux; sys_platform=="linux2"
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/, app-admin/ansible-molecule/files/
@ 2022-09-26 1:01 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2022-09-26 1:01 UTC (permalink / raw
To: gentoo-commits
commit: 5ba994476880e08472fc4569583de5ceb72d6352
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 00:40:59 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 01:01:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba99447
app-admin/ansible-molecule: drop 3.5.2-r1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-molecule/Manifest | 1 -
.../ansible-molecule-3.5.2-r1.ebuild | 90 ----------------------
.../files/ansible-molecule-3.5.2_pyyaml6.patch | 11 ---
3 files changed, 102 deletions(-)
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index 838c6e6b4a11..e3f14924e7cc 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1,2 +1 @@
DIST ansible-molecule-4.0.1.tar.gz 301517 BLAKE2B 73cf7a2257368c737b9003236bf77011de167dd6f692166702e7948c136202b33bcce1c70893b61a95af9baa90e7b5266a5fa889e3bba0e5a8c9c1e6f48fec9a SHA512 7515e07bf791d5586e1f5fb4ce0d2f731c94c8268c589155340b2bdc1528534084870e66e492b2d883f9e9764293c93799a4c75478523502a2f37ad0642a472d
-DIST molecule-3.5.2.tar.gz 290964 BLAKE2B b6c6bb8ecdb4230d23161e25fa003c8979f48fc1705bfba7d14204fbaa3e9c235a71db0c4ccbab5c4328ddb8a0725d3c2ba7cb4b624afda21c6453c8be824f3e SHA512 04a7d1f7e7e098c0ada71d8dc9a3e3a94320033942d8ee03f2c51ec185405d2ee13fcb44000a4942ec66923f0426717ab7e2c3a785ddda7a23515096474dc3c3
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
deleted file mode 100644
index 2a2c00db61e6..000000000000
--- a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,90 +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_SINGLE_IMPL=1
-
-inherit distutils-r1 optfeature
-
-MY_PN="${PN#ansible-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
-HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="selinux"
-
-RDEPEND="$(python_gen_cond_dep '
- >=dev-python/ansible-compat-0.5.0[${PYTHON_USEDEP}]
- <dev-python/cerberus-1.3.3[${PYTHON_USEDEP}]
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}]
- >=dev-python/enrich-1.2.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- <dev-python/paramiko-3[${PYTHON_USEDEP}]
- <dev-python/pluggy-2.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
- >=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
- >=dev-util/cookiecutter-1.7.3[${PYTHON_USEDEP}]
- selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
-')"
-BDEPEND="$(python_gen_cond_dep '
- >=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm_git_archive-1.1[${PYTHON_USEDEP}]
- doc? (
- dev-python/ansible-pygments[${PYTHON_USEDEP}]
- >=dev-python/simplejson-3.17.2[${PYTHON_USEDEP}]
- )
- test? (
- >=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}]
- <dev-python/pexpect-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-html-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}]
- dev-util/yamllint
- )
-')"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5.2_pyyaml6.patch
-)
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_sphinx docs '>=dev-python/sphinx-notfound-page-0.7.1' '<dev-python/sphinx_ansible_theme-0.9.0'
-distutils_enable_tests --install pytest
-
-src_prepare() {
- default
-
- if ! use selinux; then
- sed -i "/^\s\+selinux/d" setup.cfg || die "Failed to remove dependency on SELinux"
- fi
-
- # Several issues with tests from this file:
- # - quite a few of these use the network;
- # - test_command_dependency[shell] only works if Molecule has previously been installed;
- # - tests involving creation of a new scenario fail on ansible-lint errors, even though
- # a config file is deployed which should skip expected issues.
- rm -f src/molecule/test/functional/test_command.py
-}
-
-python_test() {
- distutils_install_for_testing --via-venv
- distutils-r1_python_test
-}
-
-pkg_postinst() {
- optfeature_header "Some optional packages commonly used in Molecule scenarios:"
- optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint
-}
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
deleted file mode 100644
index 80a7d8b7a87d..000000000000
--- a/app-admin/ansible-molecule/files/ansible-molecule-3.5.2_pyyaml6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -74,7 +74,7 @@
- packaging
- paramiko >= 2.5.0, < 3
- pluggy >= 0.7.1, < 2.0
-- PyYAML >= 5.1, < 6
-+ PyYAML >= 5.1
- rich >= 9.5.1
- subprocess-tee >= 0.3.5
- selinux; sys_platform=="linux2"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-26 1:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-26 9:16 [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/, app-admin/ansible-molecule/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2022-09-26 1:01 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox