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 453F8138334 for ; Mon, 25 Nov 2019 12:35:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D68BE0A60; Mon, 25 Nov 2019 12:35:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6B1F3E0A60 for ; Mon, 25 Nov 2019 12:35:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 48F5334D38F 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 DE9FC8CB 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: <1574685311.f7595ec5e0419cc5f2373a3395e5182baa9f7320.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-packaging/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild X-VCS-Directories: dev-python/jaraco-packaging/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f7595ec5e0419cc5f2373a3395e5182baa9f7320 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: 343fa2f8-2a80-4733-a50a-8d6d8c307cf6 X-Archives-Hash: 7fe963715e0c9ee1479d53841e58dcdb commit: f7595ec5e0419cc5f2373a3395e5182baa9f7320 Author: Michał Górny gentoo org> AuthorDate: Mon Nov 25 12:25:05 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 25 12:35:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7595ec5 dev-python/jaraco-packaging: Use distutils_enable_sphinx Signed-off-by: Michał Górny gentoo.org> .../jaraco-packaging-6.2-r1.ebuild | 30 ++++------------------ 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild index e3e5f83ada4..79852d7bffa 100644 --- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild +++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild @@ -11,11 +11,13 @@ MY_PN="${PN/-/.}" DESCRIPTION="Tools to supplement packaging Python releases" HOMEPAGE="https://github.com/jaraco/jaraco.packaging" SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-python/importlib_metadata[${PYTHON_USEDEP}] @@ -24,28 +26,14 @@ RDEPEND=" " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_check_deps() { - use doc || return 0 - - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -56,14 +44,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() { # Skip one test which requires network access # Override pytest options to skip flake8