idella4 15/05/27 09:00:24 Modified: ChangeLog kombu-3.0.26.ebuild Log: patch by upstream to fix failed test, correction to version bordering of dev-python/pymongo, comment out funtests under py2.7 still requiring older version of dev-python/pymongo (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.46 dev-python/kombu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.46&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.46&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?r1=1.45&r2=1.46 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ChangeLog 7 May 2015 05:20:58 -0000 1.45 +++ ChangeLog 27 May 2015 09:00:24 -0000 1.46 @@ -1,6 +1,12 @@ # ChangeLog for dev-python/kombu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.45 2015/05/07 05:20:58 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.46 2015/05/27 09:00:24 idella4 Exp $ + + 27 May 2015; Ian Delaney <[email protected]> + +files/kombu-3.0.26-pymongo-test-fix.patch, kombu-3.0.26.ebuild: + patch by upstream to fix failed test, correction to version bordering of dev- + python/pymongo, comment out funtests under py2.7 still requiring older version + of dev-python/pymongo *kombu-3.0.26 (07 May 2015) 1.2 dev-python/kombu/kombu-3.0.26.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.26.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.26.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.26.ebuild?r1=1.1&r2=1.2 Index: kombu-3.0.26.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.26.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kombu-3.0.26.ebuild 7 May 2015 05:20:58 -0000 1.1 +++ kombu-3.0.26.ebuild 27 May 2015 09:00:24 -0000 1.2 @@ -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/kombu/kombu-3.0.26.ebuild,v 1.1 2015/05/07 05:20:58 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.26.ebuild,v 1.2 2015/05/27 09:00:24 idella4 Exp $ EAPI=5 @@ -29,7 +29,7 @@ amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] ) sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] ) msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" - +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 DEPEND="${RDEPEND} >=dev-python/setuptools-0.7[${PYTHON_USEDEP}] test? ( >=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}] @@ -39,8 +39,7 @@ >=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}] dev-python/django[${PYTHON_USEDEP}] >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] - >=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}] - <dev-python/pymongo-3.0[${PYTHON_USEDEP}] + >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) doc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/django[${PYTHON_USEDEP}] @@ -58,7 +57,8 @@ REQUIRED_USE="sqs? ( ${PY27_REQUSE} ) doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are py2 capable only -PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch ) +PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch \ + "${FILESDIR}"/${P}-pymongo-test-fix.patch ) python_prepare_all() { https://github.com/celery/kombu/issues/246 @@ -85,11 +85,13 @@ nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}" # funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6. # https://github.com/celery/kombu/issues/411 - if [[ "${EPYTHON}" == python2.7 ]]; then - pushd funtests > /dev/null - esetup.py test - popd > /dev/null - fi + # Fix to https://github.com/celery/kombu/issues/474 breaks the + # funtests under >=dev-python/pymongo-3.0.2 +# if [[ "${EPYTHON}" == python2.7 ]]; then +# pushd funtests > /dev/null +# esetup.py test +# popd > /dev/null +# fi fi }
