diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2023-05-11 11:53:42 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2023-05-11 11:56:09 +0100 |
| commit | cf9f693285c25efe76321ddbff58907e9a9c0ab6 (patch) | |
| tree | 5bf2e25e34ef05261d46ca4c147b13d0dc41be4b | |
| parent | dev-python/mkdocstrings: new package, add 0.21.2 (diff) | |
| download | gentoo-cf9f693285c25efe76321ddbff58907e9a9c0ab6.tar.gz gentoo-cf9f693285c25efe76321ddbff58907e9a9c0ab6.tar.bz2 gentoo-cf9f693285c25efe76321ddbff58907e9a9c0ab6.zip | |
app-admin/ansible-molecule: enable USE=doc on 5.0.5
Turns out the dependency hell could be put under control merely
by disabling one of the tests in dev-python/mkdocstrings along with
not enabling documentation generation in same.
Bug: https://bugs.gentoo.org/905911
Signed-off-by: Marek Szuba <marecki@gentoo.org>
| -rw-r--r-- | app-admin/ansible-molecule/ansible-molecule-5.0.1.ebuild | 15 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 5 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app-admin/ansible-molecule/ansible-molecule-5.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-5.0.1.ebuild index ac127b363db2..c8963517cde0 100644 --- a/app-admin/ansible-molecule/ansible-molecule-5.0.1.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-5.0.1.ebuild @@ -7,14 +7,10 @@ PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools DOCS_BUILDER="mkdocs" -# cairosvg and pillow are technically speaking dependencies of the mkdocs-material -# plugin "social" (Bug #906126). -# Still missing: dev-python/mkdocstrings[python] DOCS_DEPEND=" - dev-python/pillow >=dev-python/mkdocs-ansible-0.1.4 dev-python/mkdocs-autorefs - media-gfx/cairosvg + dev-python/mkdocstrings-python " PYPI_PN="molecule" @@ -43,8 +39,17 @@ RDEPEND="$(python_gen_cond_dep ' >=dev-util/cookiecutter-1.7.3[${PYTHON_USEDEP}] selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] ) ')" +# cairosvg and pillow are technically speaking dependencies of the mkdocs-material +# plugin "social" (Bug #906126). +# mkdocstrings is here rather than in DOCS_DEPEND because the latter does not seem +# to support the [use] syntax at present. BDEPEND="$(python_gen_cond_dep ' >=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}] + doc? ( + dev-python/mkdocstrings[python,${PYTHON_USEDEP}] + dev-python/pillow[truetype,${PYTHON_USEDEP}] + media-gfx/cairosvg + ) test? ( app-admin/ansible-lint[${PYTHON_USEDEP}] app-misc/check-jsonschema[${PYTHON_USEDEP}] diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 17e2559ff1c3..0af297a70e2b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,11 +6,6 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. -# Marek Szuba <marecki@gentoo.org> (2023-05-11) -# New doc-building system which depends on many packages currently absent -# from the tree. Work in progress. ->=app-admin/ansible-molecule-5.0.0 doc - # Joonas Niilola <juippis@gentoo.org> (2023-05-07) # Doesn't compile, see #894210. dev-libs/log4cxx smtp |