From 1d1dce10f25c04f3f73cb15e5f01a4cde7d18593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 15 Nov 2019 16:52:35 +0100 Subject: [PATCH] dev-python/atomicwrites: Enable py3.8, modernize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable python3.8. Use any-r1 API to provide for building docs without sphinx being py3.8 enabled. Signed-off-by: Michał Górny --- .../atomicwrites/atomicwrites-1.2.1.ebuild | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild index 9c11548028a0c..85e9f5b5d666e 100644 --- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild +++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} ) +PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} ) inherit distutils-r1 @@ -13,17 +13,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" +IUSE="doc" -DEPEND=" +# TODO: remove impl limiters when sphinx is py38 +BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ' -2 python3_{5,6,7} pypy3) ) - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) " +distutils_enable_tests pytest + +python_check_deps() { + use doc || return 0 + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" +} + python_prepare_all() { sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die distutils-r1_python_prepare_all @@ -35,7 +45,3 @@ python_compile_all() { HTML_DOCS=( docs/_build/html/. ) fi } - -python_test() { - py.test -v || die "Tests fail with ${EPYTHON}" -}