mgorny 15/07/26 18:57:27 Modified: mock-1.2.0.ebuild ChangeLog Log: Revert previous commit because of introduced unsatisfiable dependencies. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.4 dev-python/mock/mock-1.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild?r1=1.3&r2=1.4 Index: mock-1.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mock-1.2.0.ebuild 26 Jul 2015 14:52:45 -0000 1.3 +++ mock-1.2.0.ebuild 26 Jul 2015 18:57:27 -0000 1.4 @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild,v 1.3 2015/07/26 14:52:45 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild,v 1.4 2015/07/26 18:57:27 mgorny Exp $ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit distutils-r1 @@ -22,7 +22,8 @@ >=dev-python/pbr-1.3[${PYTHON_USEDEP}] test? ( ${CDEPEND} - $(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' 'python2_7' pypy) + dev-python/nose[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' 'python2_7' 'python3_3') )" RDEPEND=" ${CDEPEND} @@ -30,8 +31,7 @@ " python_test() { - # Taken from tox.ini - "${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}" + nosetests || die "tests fail under ${EPYTHON}" } python_install_all() { 1.95 dev-python/mock/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/mock/ChangeLog?rev=1.95&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/mock/ChangeLog?rev=1.95&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/mock/ChangeLog?r1=1.94&r2=1.95 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- ChangeLog 26 Jul 2015 14:52:45 -0000 1.94 +++ ChangeLog 26 Jul 2015 18:57:27 -0000 1.95 @@ -1,6 +1,9 @@ # ChangeLog for dev-python/mock # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.94 2015/07/26 14:52:45 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.95 2015/07/26 18:57:27 mgorny Exp $ + + 26 Jul 2015; <[email protected]> mock-1.2.0.ebuild: + Revert previous commit because of introduced unsatisfiable dependencies. 26 Jul 2015; Ian Delaney <[email protected]> mock-1.2.0.ebuild: re-add pypy support dropped from prior versions, correction to deps, update to
