revbump; drop un-needed dep, update test phase to match its current state, rm 2.7...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index ec538aa3251ff734d631a7ce0ab5b53e21a6c2df..6b3a56bf582224de3839302572fd26b90a8c45ca 100644 (file)
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pytest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.114 2015/04/05 04:36:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.115 2015/04/05 13:07:43 idella4 Exp $
+
+*pytest-2.7.0-r1 (05 Apr 2015)
+
+  05 Apr 2015; Ian Delaney <idella4@gentoo.org> +pytest-2.7.0-r1.ebuild,
+  -pytest-2.3.5.ebuild, -pytest-2.4.2.ebuild, -pytest-2.5.2.ebuild,
+  -pytest-2.7.0.ebuild:
+  revbump; drop un-needed dep, update test phase to match its current state, rm
+  2.7.0 and old
 
 *pytest-2.7.0 (05 Apr 2015)
 

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 6090b9a678deab59e0de386850a8f1bde76d6ab9..1946b159620a43483676eaf341f93d1468e5ff8e 100644 (file)
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,20 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pytest-2.3.4-unicode.patch 1589 SHA256 2ebca1e0b4c79d45c1d558938f04aa8a30166f90eb0d40ec0809679b95e6ad0a SHA512 d187d08608f8cc5c9f97a2cd58497262f37b0c8c08a88eca1ee2e9726196a97d56d1d510cfde1e7d74ce49086608164145525e37f23086efff7e457d71d8f980 WHIRLPOOL bfcf7099a8d516020f4914d8c6963f54b1e92e323ab939e214bff42cb556d76e64fe98bede7e566173dd09906407fcdab9786d11216bb92c209a9999cf421cbb
 AUX pytest-2.4.2-pexpect-3.0.patch 3514 SHA256 92909fdf1179634e95a4bd4d56bd946366e99fcc09643b7a160ac44284fde3d7 SHA512 83439ad1b3f952cf728848a3daabc28ad723917dd5e305ab87066805fa379aad28649cdc6acd060f85a15caebd0db416c794dae526195f62fd6dd0c0ec607de0 WHIRLPOOL 5e580ecf0b191d70f1640d8dc6b949cdbd905c583b32045fd79982c77b1b11452d35c34613bcab03caab82b127173f422f2e80de577349f34e211771b5f9e266
 DIST pytest-2.3.4.zip 527214 SHA256 5616f744a311c5f5fbb44943aaa41c32df70ba132159a0a9fb6c999060d7645c SHA512 390ceb05fc79eec14861ac23f74b4ca64cff54a10c8a7d61ac148fd101d418c1f286777c50f181148c60e0b02c6bdeacf224ad0b2a88104b3b29e7761ed1bea9 WHIRLPOOL 3afa5442d4900ee93a11614e50d67407a2fc6d2f55ffd700b7b64b1ed20be0895f6fe35adeb9926491eea1b2500f62d49f77afd17471c0a4f1be52cb971f4ab6
-DIST pytest-2.3.5.tar.gz 426328 SHA256 804c28bef415fc6a54de7934f05b2d67a9cc8a230de98685fca274d9fcbe8b1c SHA512 4cda3149ca4b69b88c2df65d7c474506e852ee1daa9e6b1ca3dbde8b7ffe0cce09f2fb4ef696f54df7f6ce807cd472dd8447cfc32686902b2b214b18e5719060 WHIRLPOOL a2dd7c319d73e6c32077685d65785c672dbb6faa01ac4ed116520128a1b03b3a10b88e65957b736132fbc3a667b43840c28081ef4a4a8ddd2cd73f8727c778cf
-DIST pytest-2.4.2.tar.gz 553004 SHA256 bccbbed432b1e95381fbb958c27aabcb751ccc337769091de8b7e5cd25ca00e0 SHA512 2ffbc74c536fa4542b9f9afb257428cde98648c76335bdc8d3fd515fd094410fe1e71e502918d780f1d8070bebf4e4c24b33cab04d0f48ca983d907bfc43d3db WHIRLPOOL e51543a549622dfd204551f3625c62cdac84b33107e5dd493574a6f05f4ee55a830ec52ce23580733471df89450caa0d389cc77c9966186bd9d2d64e57403638
-DIST pytest-2.5.2.tar.gz 608703 SHA256 962452611799878616d6df5e7674cc2c356f902ed005dc4dae9d4e79bb8abda4 SHA512 d291f229f4c0a2132c437dde6ca04bf87701fe270c2fa314104badad9221ab866251890c66387d23fefd3ab1f928ee3b290dac21e3d62e7660af8903e85a2f36 WHIRLPOOL 47588d3a2b62f9a8f4df248b2f8b4c8b4b86365839e766bf644ea6c54d0f75c92ae139050cd6a5db080c076b9f867be48fe9c81da19db5285a382c1cda918310
 DIST pytest-2.6.1.tar.gz 627761 SHA256 994dabcb3149659d259add2aa7d11bff4d35efb7cf4c8233fa9b0b62c1255c3c SHA512 1bfbe27491800943484616a37cfe0f2f8677e3b2a25aee19f842bdf66a9c0205af8c2aecaeb50823970ab9f7042b1bb9115e3c4d689fe568a17a062c50ead829 WHIRLPOOL cae1ea28723c62b87a027e3a78ab417e99cb12d412c83131058b185cffae12a215ef07459144c30b7028e202407549db76d877cd1c9fbe6cb2e39bc5da9df421
 DIST pytest-2.6.3.tar.gz 634974 SHA256 97f41dd9f318095b431945bede7a6f02c62c0a40a6c7a976a3820ea377a0eecc SHA512 44fe4c7af804530160a1827b837d35be9492eebb6a382391c820568f492ce7ca50837a47e92873b014ee1655d83a8cb270e0c4149e683efedc25135791733c7a WHIRLPOOL d15f2a1148e33dd3d42a9879d0032f6473dd100ca33ac8797531b76a1ce72a7c96dc2fa8902f68abedf4371d0678c30d7856625639b59a5fe4c02303ea5177e4
 DIST pytest-2.6.4.tar.gz 512090 SHA256 550883b98184cef6cbb980d4d90051330aeae41075092f98ef0215719af8ef33 SHA512 b17f79b0f3c0f6051bedb0d7acadc5d569b3b90b2fce2eddda06a21b654f6077f934aaa9617152d6b2f8babb95c37494f18e050841af601f7f37de25c15b32fd WHIRLPOOL f281b8c0b04102dc9f4a52dbff812fb0fcff9daa9941ae7f24d694d87429e669204ad931e0b297afcd890f818679b73ad96a403c21851dccf050ecc81a16502d
 DIST pytest-2.7.0.tar.gz 526640 SHA256 91dc842785417208d57e5e8dc8bb40f57316c45da24a50c53b49cb8d045519d6 SHA512 80c7a804895ac4dad2e4f47de130df9159076c63016fe64eefcea92d5bff339fcbf5c103258ade7e4068566caf1508d2d737f449a934a1e2673533e4ed7412cb WHIRLPOOL a117ad21d90823a7fc0a8155c288d8c2c46e908138b9af1369a57b8887dbffd31c7e71ed37593f520f427e85732b38d94f1ef9e9f2820e552acecf5d6bc42bf9
 EBUILD pytest-2.3.4.ebuild 1604 SHA256 d91949eea7f8041bb7c693bfa96880e58e0d5062d224df8800d35b2520672db3 SHA512 11d41756e876dbec4e57ca10e1431d60fd3fe4fcbe258d37ee264a99b4894338e2951334f8b30bcd28f71e4d76040e624cb094fc347b151b2536a7e9295f9b8d WHIRLPOOL 6ac6be6e6e349a64a9a722073a9654c9d01819dcf9bff5c2e917c823827da6a6a4fe74d88cc04583a241076e44675d8bde5b65b33192912162c33d3d10418c62
-EBUILD pytest-2.3.5.ebuild 1563 SHA256 fedfd81744d3fae14868c6559a0a8fc6299a77b050bacc098b869cdd0fc33b40 SHA512 62a2b7ddd9e37bfce33203a62469fc3b1bd385ecbdf9de3d9852327a8223593abe03628de48bc164f090977c4409f6d766f75103c95e2647440ff734479d8199 WHIRLPOOL 84e3e96b12bd2e7ba41ec8a09c41961c37c29ae72e97caecfa97b29a99681d04f03f5ae10639760a6e1b0a6bc022e598940ad2d59dafa4d1b5dadd3d6da89162
-EBUILD pytest-2.4.2.ebuild 1899 SHA256 a031bab66f7b92e0b4633feb9094d52d8b8e3e9d441fce43bc8e4950b9f84aff SHA512 ff1c1fceb12c1f4a2623cffbf5f6f539752b5bed6024f1f118ec3c25a2f7564ee84bded6aaa460de73c12343351dc3791f0559892ba74f9aa9d1a6c287f48a8b WHIRLPOOL d8432b8e8132af669c4922c9244f77e75c3c93c6f94db12a96beb390ba68f1b78d8c3f5623d72e9598db37bb88f224f53726e19c7074611d4a57948e4998a42c
-EBUILD pytest-2.5.2.ebuild 1854 SHA256 eb4fc2c6a853e6b64bd095797fa301d54616355890556c9abc5db6028aa30d9b SHA512 912f51b9de5c7be2a1a0480ecc74d7b283df1b1afcf26df37f1c4a450234481e83eebbb17e58991c5d6c621aef9012a33bf01641c4edf5e902987d36a546a990 WHIRLPOOL 8a7a3da263b6acb2afb41df09584129a6e0ee6b94f8564cbab5726616d3f58d0be5dd857057173b0bcccb03e6c490f3ee15f7276af2c5e7fa4d8f302565e1af7
 EBUILD pytest-2.6.1.ebuild 1940 SHA256 09ddd32c20858bb51e67764b2a8cdd6c7306c8483aba4e981c91a38cc8cf0dc3 SHA512 1b38a853638b26ab181f1919915da6ed6dc64b1c0369d94aea3282a1391ae73964b47b5b1acdfcfb2eb1107ead6c957c52f2dba205e4bb137c156135d06f384b WHIRLPOOL 9bfd01d3028c78332eb6e79929b113d87e1b49117ef52d65a31b5178dc67ce7e9013670c31d782bf405f6496fda634ca4e713d243428ab3b639b71aa636ce4f4
 EBUILD pytest-2.6.3.ebuild 1940 SHA256 f21905d9fae944393994f895bd289f6b31c2178d09d974a9a2a16c97bba2b346 SHA512 c0c79e1ac72ee97e015453dd9b91ecbf7c1e99fbd4263215fd852268edf0ec3b2ae4159a8b136db0af46b4a05b82c9596e07ed413b245ac69ef61ca856e26e79 WHIRLPOOL aed5a8052f57f83a438aaf7b0117c6303e76bc12a816c4d2560b67387a613f9849052e5e939a1efdb84f0a648421528dfc3856f7b4b6a266994e338748633869
 EBUILD pytest-2.6.4.ebuild 1910 SHA256 aa6a07dc5cf8e2a11ed923f369730c925a93b86369d82d1bd9a2bd1a3445d0b6 SHA512 b0c0dca476a299dc14fe5549cb1a4bcd690c49a486bf94910f74aac8baa899e3587426317c4c8312ac2ab5ca5b6211612f4af7c6fc4260f9a9e10fff617dc965 WHIRLPOOL 9b9d6c22ae8b6ab6a3b24b96fd9d4b9b429b3331a1c2dd73fa73882cf056efe92b0d837c1347da3bb3e6cb8bc1c9a2dfb610c7fe176a8c8ea2594f64ff1d4bdf
-EBUILD pytest-2.7.0.ebuild 1911 SHA256 ca3b0547aa85c763f2b10d71031d10ab4076c9c0f478c83bc60673665902f2c7 SHA512 c260e785505208044d1a1ac625a1ae51ac36cd6307b9c5bb0df2e697f4652de524608f842fb74cc57992aeb598c9b531c8a72f44395aefdbd91d1d74bcd3faa2 WHIRLPOOL 36433eb60272bc0809c2ff9c2dcaa09f73495a0a89a277eb475f645c11fc7ffd540324b803f0dbfdb5b12f04bd770194cf04ab1720703796c23b521d12593054
-MISC ChangeLog 14403 SHA256 c316a7a9c7e583d698024d9dbfe34141ee6488a2bdf2511b90cd0c95717960a3 SHA512 6de19280735cee317ed3ec8b4fc4ace2a08679de69ca3460c3b600443b5e33b3348e93852edcbed98ced29b2570f8ef64f00253f57f88224cf0a8dd0b3312862 WHIRLPOOL 1da8f9162359f0d4e5d5d702dcb1e8045956d4787a8f91f5e47fe8c2eb32ea7b57c3b494e4af7f666551435625179fd4584db388482da5329fd71f3e5eb1dfb1
+EBUILD pytest-2.7.0-r1.ebuild 2042 SHA256 77f0e3405287ccd2463875b995a51c54f7f73c90fbd2c37c94bffd416d87a681 SHA512 794be07df676bb00af92eb6a1da95c7971ac4c357130fa7b87fb0bb35069ba6f2df92a6f635d45af5cfd05ea51e0ef80baee4e3a60e7999818e5e49e11c680d7 WHIRLPOOL bc85c7e9c284525938cad04c9889131d6e6c39586abedfbf6a53ff17184733578911575d899d15637060087387faad83a6af3db06106495035598a8dc0d773d1
+MISC ChangeLog 14697 SHA256 ce4b14e18fb3d5c979aef8a28969dc11e1283c327963ee0b5100097f0bfec9bc SHA512 cf51277c821c218369f80c1a38fef5417ef8b89677f63da52f126299bfa76ecca62dac774a850c5d594ce0eb3b49919331caa2db330db8d9bbfd64fceb31ad64 WHIRLPOOL efbaa1eedd82a9425a2e041fd228f94f15ab80ae94530427ea8d5d66193aa8a28935db4d78565885ef3d3e46589049e0d588637aabf8cb27652d7fb2969b511a
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlUhM60ACgkQso7CE7gHKw0aVQCg0/JOuDJTneg4zqqOlSn+R3wY
+WH8AmgIa1xz7FSWjFbD6fwlDXNYWSUPh
+=vQ3X
+-----END PGP SIGNATURE-----

diff --git a/dev-python/pytest/pytest-2.3.5.ebuild b/dev-python/pytest/pytest-2.3.5.ebuild
deleted file mode 100644 (file)
index afbf0a3..0000000
--- a/dev-python/pytest/pytest-2.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.5.ebuild,v 1.18 2014/03/31 20:31:59 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="py.test: simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.13"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-       # Disable versioning of py.test script to avoid collision with
-       # versioning performed by the eclass.
-       sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-       grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-       distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-       if use doc; then
-               mkdir doc/en/.build || die
-               emake -C doc/en html
-       fi
-}
-
-python_test() {
-       "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && dohtml -r doc/en/_build/html/
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/pytest/pytest-2.4.2.ebuild b/dev-python/pytest/pytest-2.4.2.ebuild
deleted file mode 100644 (file)
index b0e3d2e..0000000
--- a/dev-python/pytest/pytest-2.4.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.4.2.ebuild,v 1.18 2014/11/10 11:21:56 ago Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="py.test: simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.17"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-       )
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-       "${FILESDIR}/pytest-2.4.2-pexpect-3.0.patch"
-)
-
-python_prepare_all() {
-       # Disable versioning of py.test script to avoid collision with
-       # versioning performed by the eclass.
-       sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-       grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-       distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-       if use doc; then
-               mkdir doc/en/.build || die
-               emake -C doc/en html
-       fi
-}
-
-python_test() {
-       "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-               --ignore=doc/en/example/nonpython/test_simple.yml \
-               || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && dohtml -r doc/en/_build/html/
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/pytest/pytest-2.5.2.ebuild b/dev-python/pytest/pytest-2.5.2.ebuild
deleted file mode 100644 (file)
index b731bf7..0000000
--- a/dev-python/pytest/pytest-2.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.5.2.ebuild,v 1.6 2014/07/19 18:59:11 floppym Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="py.test: simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.20"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-       )
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-       # Disable versioning of py.test script to avoid collision with
-       # versioning performed by the eclass.
-       sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-       grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-       distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-       if use doc; then
-               mkdir doc/en/.build || die
-               emake -C doc/en html
-       fi
-}
-
-python_test() {
-       "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-               --ignore=doc/en/example/nonpython/test_simple.yml \
-               || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && dohtml -r doc/en/_build/html/
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/pytest/pytest-2.7.0.ebuild b/dev-python/pytest/pytest-2.7.0-r1.ebuild
similarity index 80%
rename from dev-python/pytest/pytest-2.7.0.ebuild
rename to dev-python/pytest/pytest-2.7.0-r1.ebuild
index f1fb5e57fa55878c8c6cf3e6f48a17f9e0be4545..42db8e5991ad19bf619ab7aad28ef5c1d5a32bf0 100644 (file)
--- a/dev-python/pytest/pytest-2.7.0.ebuild
+++ b/dev-python/pytest/pytest-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.7.0.ebuild,v 1.1 2015/04/05 04:36:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.7.0-r1.ebuild,v 1.1 2015/04/05 13:07:43 idella4 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -22,9 +22,7 @@ RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
 #pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
 DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               dev-python/pexpect[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}] )
+       test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
@@ -46,9 +44,15 @@ python_compile_all() {
 }
 
 python_test() {
-       "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-               --ignore=doc/en/example/nonpython/test_simple.yml \
-               || die "tests failed with ${EPYTHON}"
+       # test_nose.py not written to suit py3.2 in pypy3
+       if [[ "${EPYTHON}" == pypy3 ]]; then
+               "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+                       --ignore=testing/test_nose.py \
+                       || die "tests failed with ${EPYTHON}"
+       else
+               "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+                       || die "tests failed with ${EPYTHON}"
+       fi
 }
 
 python_install_all() {