summaryrefslogtreecommitdiff
path: root/dev-python/pytest-catchlog
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-11-10 00:43:02 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-11-10 00:43:02 +0000
commita5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
treee6d8d3589fcd01fbc3f1286185639163daa81424 /dev-python/pytest-catchlog
parentfceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)
gentoo resync : 10.11.2017
Diffstat (limited to 'dev-python/pytest-catchlog')
-rw-r--r--dev-python/pytest-catchlog/Manifest2
-rw-r--r--dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild6
2 files changed, 5 insertions, 3 deletions
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
index 9aea26f2e22f..8a99e93d8097 100644
--- a/dev-python/pytest-catchlog/Manifest
+++ b/dev-python/pytest-catchlog/Manifest
@@ -1,4 +1,4 @@
DIST pytest-catchlog-1.2.2.zip 18028 SHA256 4be15dc5ac1750f83960897f591453040dff044b5966fe24a91c2f7d04ecfcf0 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031 WHIRLPOOL 522f34a6f54f15d1cf1380508517c50f9892553ae8b134c91a399f90c4534762fe88e4b3f7a5608fabf54aee1d53a4eb1e5e5473549bbafe772ba878f4116189
-EBUILD pytest-catchlog-1.2.2.ebuild 726 SHA256 a457722c530d79fcd4fadff3a0093138257e4d30d4ff55536d9ed4b37eaa3072 SHA512 9bd9dc78adb299480d5c37cadb9c6ff439cb1b28f585275467b499b39e78ca12e8d2759bb79e1658127640e6da2bbe976f7aa4c6b237f222924c36715627e4aa WHIRLPOOL 880641748d3e24404ba10467d3ccafaaf09f42af870cf18da0c5ad07261d25aac2299598314962663c7baad6c0dfb2e561c9a686898a84e02f6e1e5b98e1fd81
+EBUILD pytest-catchlog-1.2.2.ebuild 796 SHA256 a7910df8c692cdfccbd64685b826baa9e15db3fd3e09208515ce6cb99a511c65 SHA512 e6a6c22d8fa9e3477be298d3c7da74a14fd91b4205ad5f862f963d05334afa53d15429c2f6dc635c9633578c4ad7dfdd9a276cba30193336de0ae7c8b0b96043 WHIRLPOOL 22afd819eed8d34a417b9b1fa7a4db4a721d62d4d3851936f8dd90082cd5785ed99f6b3775f0cc88fae8ed5b2d688cb9986dc9417d96ff9d1dfab5f31c6e9146
MISC ChangeLog 1820 SHA256 dde2d5ee47e26d5eee719a759d8ab78b00f40b777ee6ff90c5be4755d290570b SHA512 ddc576ef75f2f05535a5c8108d60229ed74407ef2369015a5b8e0dead2bdf2c8a68d1a5e465ea73dcb53a5f97be7c6b40f983cb315d8f92deda9909171929c2b WHIRLPOOL fc5d0469efad52530932b859adf89cd079964398657a6157ec9d5dcfa6b5e22679c413c69c8639cc1b2f9d2efbc339ef637a2afb9bec5e521df2bd23679d5552
MISC metadata.xml 384 SHA256 a244574d516bf72be41421a45e7230126bb945d6de9a7c5933ba7942d2417fe5 SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741 WHIRLPOOL fbb95baff53f5f4f0542e9d01fe704ffbe655a21b7e86f07d2eb37bbf0e25006537e4b35deccf6081847c9dd111eac0e1c40ba1d2901ba6cbc40b2c846edce9f
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