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 C65C6138335 for ; Sat, 23 Nov 2019 00:34:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18B5AE0814; Sat, 23 Nov 2019 00:34:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 E8797E0814 for ; Sat, 23 Nov 2019 00:34:55 +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 C904D34D244 for ; Sat, 23 Nov 2019 00:34:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C3278B5 for ; Sat, 23 Nov 2019 00:34:51 +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: <1574469226.8a4eda9f6f20d497517dad0f0c45f4f0ae8dae8c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/flask/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/flask/flask-1.1.1.ebuild dev-python/flask/flask-9999.ebuild X-VCS-Directories: dev-python/flask/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8a4eda9f6f20d497517dad0f0c45f4f0ae8dae8c X-VCS-Branch: master Date: Sat, 23 Nov 2019 00:34:51 +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: 3eddcc3c-f0ae-439e-a6ff-355838b9a3d9 X-Archives-Hash: 489922164937908b6ba6cc702f56b510 commit: 8a4eda9f6f20d497517dad0f0c45f4f0ae8dae8c Author: Michał Górny gentoo org> AuthorDate: Sat Nov 23 00:21:51 2019 +0000 Commit: Michał Górny gentoo 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 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() {