From 5bd606ba8960f63dd37bf058ab010979f07f16fe Mon Sep 17 00:00:00 2001
From: Marek Szuba <marecki@gentoo.org>
Date: Fri, 26 Nov 2021 00:37:25 +0100
Subject: app-admin/ansible-molecule: support >=dev-python/pyyaml-6

All that upstream commit dcf82b067b0d4a1bfb5f1c478abd0d315b5e46e5,
(to be included in the next release) did was remove the version cap
in setup.cfg, and I have just confirmed that 3.5.2 builds, tests and
installs fine against pyyaml-6.0.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 .../ansible-molecule-3.5.2-r1.ebuild               | 87 ++++++++++++++++++++++
 .../ansible-molecule/ansible-molecule-3.5.2.ebuild | 87 ----------------------
 2 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
 delete mode 100644 app-admin/ansible-molecule/ansible-molecule-3.5.2.ebuild

(limited to 'app-admin/ansible-molecule')

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
new file mode 100644
index 000000000000..21dc93e1196d
--- /dev/null
+++ b/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: does support py3.10 upstream so add it here as soon as all the dependencies are ready.
+PYTHON_COMPAT=( python3_{8..9} )
+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"
+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/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}]
+	)
+')"
+
+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
+	# Uses unpackaged yamllint
+	rm -f src/molecule/test/unit/cookiecutter/test_molecule.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/ansible-molecule-3.5.2.ebuild b/app-admin/ansible-molecule/ansible-molecule-3.5.2.ebuild
deleted file mode 100644
index f55cd367c9ac..000000000000
--- a/app-admin/ansible-molecule/ansible-molecule-3.5.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: does support py3.10 upstream so add it here as soon as all the dependencies are ready.
-PYTHON_COMPAT=( python3_{8..9} )
-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"
-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-6[${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/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}]
-	)
-')"
-
-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
-	# Uses unpackaged yamllint
-	rm -f src/molecule/test/unit/cookiecutter/test_molecule.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
-}
-- 
cgit v1.2.3-65-gdbad