diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-07-26 14:52:45 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-07-26 14:52:45 +0000 |
| commit | 17b87dff47b622b5a94b8244c96036b5037b7aa3 (patch) | |
| tree | 21b3a96107bd1cf35010eba4e5041a3c1d063eeb /dev-python/mock | |
| parent | Disable HCFLAGS='-g', it breaks ghc-7.10. (diff) | |
| download | gentoo-2-17b87dff47b622b5a94b8244c96036b5037b7aa3.tar.gz gentoo-2-17b87dff47b622b5a94b8244c96036b5037b7aa3.tar.bz2 gentoo-2-17b87dff47b622b5a94b8244c96036b5037b7aa3.zip | |
re-add pypy support dropped from prior versions, correction to deps, update to test phase
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-python/mock')
| -rw-r--r-- | dev-python/mock/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/mock/mock-1.2.0.ebuild | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-python/mock/ChangeLog b/dev-python/mock/ChangeLog index 451eae6f3431..ad352c4cee1b 100644 --- a/dev-python/mock/ChangeLog +++ b/dev-python/mock/ChangeLog @@ -1,6 +1,10 @@ # 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.93 2015/07/26 07:20:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.94 2015/07/26 14:52:45 idella4 Exp $ + + 26 Jul 2015; Ian Delaney <idella4@gentoo.org> mock-1.2.0.ebuild: + re-add pypy support dropped from prior versions, correction to deps, update to + test phase 26 Jul 2015; Jeroen Roovers <jer@gentoo.org> mock-1.2.0.ebuild: Mark ~hppa (bug #555570). diff --git a/dev-python/mock/mock-1.2.0.ebuild b/dev-python/mock/mock-1.2.0.ebuild index 894deaa54437..cbb3b26464ec 100644 --- a/dev-python/mock/mock-1.2.0.ebuild +++ b/dev-python/mock/mock-1.2.0.ebuild @@ -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.2 2015/07/26 07:20:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild,v 1.3 2015/07/26 14:52:45 idella4 Exp $ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy ) inherit distutils-r1 @@ -22,8 +22,7 @@ DEPEND=" >=dev-python/pbr-1.3[${PYTHON_USEDEP}] test? ( ${CDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' 'python2_7' 'python3_3') + $(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' 'python2_7' pypy) )" RDEPEND=" ${CDEPEND} @@ -31,7 +30,8 @@ RDEPEND=" " python_test() { - nosetests || die "tests fail under ${EPYTHON}" + # Taken from tox.ini + "${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}" } python_install_all() { |