idella4 14/05/05 15:16:07 Modified: encore-0.5.1.ebuild ChangeLog Log: drop py2.6 add pypy support, cull IUSE flags according to content absent from the tarball, patch for some tests to pass under pypy, upgrade test phase to accommadate pypy (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.2 dev-python/encore/encore-0.5.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild?r1=1.1&r2=1.2 Index: encore-0.5.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- encore-0.5.1.ebuild 3 May 2014 08:30:43 -0000 1.1 +++ encore-0.5.1.ebuild 5 May 2014 15:16:07 -0000 1.2 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.1 2014/05/03 08:30:43 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.2 2014/05/05 15:16:07 idella4 Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 pypy ) inherit distutils-r1 @@ -15,38 +15,23 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples test" +IUSE="test" -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( +RDEPEND="virtual/python-futures[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - )" + dev-python/mock[${PYTHON_USEDEP}] )" -python_compile_all() { - use doc && emake -C docs html -} +PATCHES=( "${FILESDIR}"/${P}-pypy-tests.patch ) python_test() { - if [[ ${EPYTHON} == python2.6 ]]; then - ewarn "Tests disabled for ${EPYTHON}" - return 0 - fi - nosetests || die -} - -python_install_all() { - distutils-r1_python_install_all - - use doc && dohtml -r docs/build/html/* - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples + "${PYTHON}" -m unittest discover ./${PN}/events || die + # PYTHONPATH goes astray & '-m unittest discover' loses its way. nose works + # https://github.com/enthought/encore/issues/84 + # tests for storage simply aren't written to cater to pypy + if [[ "${EPYTHON}" == python2.7 ]]; then + nosetests ./${PN}/storage || die fi } 1.8 dev-python/encore/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/ChangeLog?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/ChangeLog?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/encore/ChangeLog?r1=1.7&r2=1.8 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 3 May 2014 08:30:43 -0000 1.7 +++ ChangeLog 5 May 2014 15:16:07 -0000 1.8 @@ -1,6 +1,12 @@ # ChangeLog for dev-python/encore # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v 1.7 2014/05/03 08:30:43 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v 1.8 2014/05/05 15:16:07 idella4 Exp $ + + 05 May 2014; Ian Delaney <[email protected]> + +files/encore-0.5.1-pypy-tests.patch, encore-0.5.1.ebuild: + drop py2.6 add pypy support, cull IUSE flags according to content absent from + the tarball, patch for some tests to pass under pypy, upgrade test phase to + accommadate pypy *encore-0.5.1 (03 May 2014)
