From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1174398-garchives=archives.gentoo.org@lists.gentoo.org>
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 1025E1382C5
for <garchives@archives.gentoo.org>; Tue, 26 May 2020 12:58:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DB7A9E091C;
Tue, 26 May 2020 12:58:44 +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 B5FDBE091C
for <gentoo-commits@lists.gentoo.org>; Tue, 26 May 2020 12:58:44 +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 A6F7834EE47
for <gentoo-commits@lists.gentoo.org>; Tue, 26 May 2020 12:58:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BDCDA272
for <gentoo-commits@lists.gentoo.org>; Tue, 26 May 2020 12:58:39 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1590497909.f71ca73624254d9eec1e38b4791069cf3ea1a072.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/pytest/pytest-4.6.10.ebuild dev-python/pytest/pytest-5.4.2.ebuild
X-VCS-Directories: dev-python/pytest/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: f71ca73624254d9eec1e38b4791069cf3ea1a072
X-VCS-Branch: master
Date: Tue, 26 May 2020 12:58:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9c0d1dd5-160c-4436-8ffb-68b6977163a6
X-Archives-Hash: 6f7b50af5618132ae28218ec40659e74
commit: f71ca73624254d9eec1e38b4791069cf3ea1a072
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 12:19:31 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 26 12:58:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71ca736
dev-python/pytest: Reenable tests on py39
Closes: https://bugs.gentoo.org/725494
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest/pytest-4.6.10.ebuild | 27 ++++++++++-----------------
dev-python/pytest/pytest-5.4.2.ebuild | 19 ++++++-------------
2 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/dev-python/pytest/pytest-4.6.10.ebuild b/dev-python/pytest/pytest-4.6.10.ebuild
index f2ba4fb7643..327ad7d9b45 100644
--- a/dev-python/pytest/pytest-4.6.10.ebuild
+++ b/dev-python/pytest/pytest-4.6.10.ebuild
@@ -45,18 +45,16 @@ RDEPEND="
DEPEND="
test? (
${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/argcomplete[${PYTHON_USEDEP}]
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- !!dev-python/flaky
- !!dev-python/pytest-aiohttp
- !!dev-python/pytest-asyncio
- !!dev-python/pytest-django
- ' python2_7 python3_{6,7,8} pypy3)
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ !!dev-python/flaky
+ !!dev-python/pytest-aiohttp
+ !!dev-python/pytest-asyncio
+ !!dev-python/pytest-django
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
)"
@@ -75,11 +73,6 @@ python_prepare_all() {
}
python_test() {
- if [[ ${EPYTHON} == python3.9 ]]; then
- einfo "Skipping py3.9 due to unported deps"
- return
- fi
-
distutils_install_for_testing
# In v4.1.1, pytest started being picky about its own verbosity options.
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index c53483cbfc6..fccc727d16e 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.ebuild
@@ -39,14 +39,12 @@ RDEPEND="
# flake cause a number of tests to fail
DEPEND="${RDEPEND}
test? (
- $(python_gen_cond_dep '
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- !!dev-python/flaky
- ' python2_7 python3_{6,7,8} pypy3)
+ >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/xmlschema[${PYTHON_USEDEP}]
+ !!dev-python/flaky
)"
PATCHES=(
@@ -65,11 +63,6 @@ python_prepare_all() {
}
python_test() {
- if [[ ${EPYTHON} == python3.9 ]]; then
- einfo "Skipping py3.9 due to unported deps"
- return
- fi
-
distutils_install_for_testing
"${EPYTHON}" -m pytest -vv --lsof -rfsxX \