From 0939028a14c274bea806deefd5bb09fe81ca8c15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 25 Nov 2019 13:25:02 +0100 Subject: [PATCH] dev-python/jaraco-classes: Use distutils_enable_sphinx MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../jaraco-classes-2.0-r1.ebuild | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild index 5bb9da703f89..d9847a4bfa73 100644 --- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild +++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild @@ -16,7 +16,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}] @@ -24,11 +25,6 @@ RDEPEND=" " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}]') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] @@ -37,14 +33,9 @@ DEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" -RESTRICT="!test? ( test )" - -python_check_deps() { - use doc || return 0 - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/jaraco-packaging-3.2" \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -55,14 +46,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Avoid ImportMismatchError, override pytest options to skip flake8 pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \ -- 2.26.2