From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 382AC138334 for ; Mon, 25 Nov 2019 12:35:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43D6BE0A64; Mon, 25 Nov 2019 12:35:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74DE8E0A64 for ; Mon, 25 Nov 2019 12:35:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66B0334D389 for ; Mon, 25 Nov 2019 12:35:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B99DF8C9 for ; Mon, 25 Nov 2019 12:35:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1574685309.0939028a14c274bea806deefd5bb09fe81ca8c15.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-classes/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild X-VCS-Directories: dev-python/jaraco-classes/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0939028a14c274bea806deefd5bb09fe81ca8c15 X-VCS-Branch: master Date: Mon, 25 Nov 2019 12:35:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d548a428-0639-45fe-ab4a-7fddd28aa275 X-Archives-Hash: 7cb3baaa97903ecb246503737421ddc4 commit: 0939028a14c274bea806deefd5bb09fe81ca8c15 Author: Michał Górny gentoo org> AuthorDate: Mon Nov 25 12:25:02 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 25 12:35:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0939028a dev-python/jaraco-classes: Use distutils_enable_sphinx Signed-off-by: Michał Górny gentoo.org> .../jaraco-classes/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 5bb9da703f8..d9847a4bfa7 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" \