summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-11-03 16:18:41 -0400
committerMike Gilbert <floppym@gentoo.org>2017-11-03 16:19:30 -0400
commitf47aa832af8470c6d9eb8a92b18bfa265d57d0fb (patch)
tree90f68aea1db86125db6c8da9c183c43d3d8670bb /dev-python
parentdev-python/pytest-capturelog: block dev-python/pytest-catchlog (diff)
downloadgentoo-f47aa832af8470c6d9eb8a92b18bfa265d57d0fb.tar.gz
gentoo-f47aa832af8470c6d9eb8a92b18bfa265d57d0fb.tar.bz2
gentoo-f47aa832af8470c6d9eb8a92b18bfa265d57d0fb.zip
dev-python/pytest-catchlog: block dev-python/pytest-capturelog
Closes: https://bugs.gentoo.org/636468 Package-Manager: Portage-2.3.13_p1, Repoman-2.3.3_p81
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index b2170e329858..b948075d79ee 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -16,12 +16,14 @@ LICENSE="MIT"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
-RDEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
+COMMON_DEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
DEPEND="
test? (
- ${RDEPEND}
+ ${COMMON_DEPEND}
>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
)"
+RDEPEND="${COMMON_DEPEND}
+ !dev-python/pytest-capturelog"
python_test() {
PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die