gentoo resync : 15.12.2019

1 files changed, 9 insertions, 13 deletions

diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
index 80cc931b35be..3cfa93664536 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -22,7 +22,8 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples test"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
@@ -31,27 +32,22 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
+PATCHES=(
+	# taken from upstream git, will be in next release
+	"${FILESDIR}/flask-1.1.1-py38.patch"
+)
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_sphinx docs
 
 python_test() {
 	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
-		py.test -v || die "Testing failed with ${EPYTHON}"
+		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( docs/_build/html/. )
 
 	distutils-r1_python_install_all
 }