commit: 8a4eda9f6f20d497517dad0f0c45f4f0ae8dae8c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 00:21:51 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 00:33:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4eda9f
dev-python/flask: Prepare for 3.8, fix tests
Update the ebuild to be 3.8-ready. However, don't add 3.8 yet as it
fails one test. Need to investigate or look for a patch.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/flask/flask-1.1.1.ebuild | 9 +++++++--
dev-python/flask/flask-9999.ebuild | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/dev-python/flask/flask-1.1.1.ebuild
b/dev-python/flask/flask-1.1.1.ebuild
index 309a5494f24..6c634728d16 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -32,9 +32,14 @@ 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}] )
+ doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+python_check_deps() {
+ use doc || return 0
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
python_prepare_all() {
# Prevent un-needed d'loading
sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
@@ -47,7 +52,7 @@ python_compile_all() {
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() {
diff --git a/dev-python/flask/flask-9999.ebuild
b/dev-python/flask/flask-9999.ebuild
index 309a5494f24..6c634728d16 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -32,9 +32,14 @@ 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}] )
+ doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+python_check_deps() {
+ use doc || return 0
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
python_prepare_all() {
# Prevent un-needed d'loading
sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
@@ -47,7 +52,7 @@ python_compile_all() {
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() {
