From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1036614-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 05ACA138334
	for <garchives@archives.gentoo.org>; Sun, 15 Jul 2018 22:22:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 06409E082D;
	Sun, 15 Jul 2018 22:22:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 D48B7E082D
	for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jul 2018 22:22:07 +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 BCAF8335C8D
	for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jul 2018 22:22:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 24DD136B
	for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jul 2018 22:22:03 +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: <1531693321.0eb79f5d9fc2947845434ee55db5f438b8d035e3.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-3.4.2.ebuild
X-VCS-Directories: dev-python/pytest/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 0eb79f5d9fc2947845434ee55db5f438b8d035e3
X-VCS-Branch: master
Date: Sun, 15 Jul 2018 22:22:03 +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-Archives-Salt: 9d2e8975-9dec-455b-a0f3-e2aec3efcc52
X-Archives-Hash: 89c0540d27880c3576a54d36f8babd76

commit:     0eb79f5d9fc2947845434ee55db5f438b8d035e3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 21:59:41 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 22:22:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb79f5d

dev-python/pytest: Block pytest-capturelog since it breaks tests

 dev-python/pytest/pytest-3.4.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 1c215e18c9c..3ce7be033fd 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)"
 
+# pytest-capturelog causes a number of tests to fail
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
@@ -38,6 +39,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/pytest-capturelog
 	)"
 
 RDEPEND="