idella4 14/06/22 08:32:46 Modified: kombu-3.0.19.ebuild kombu-3.0.18.ebuild ChangeLog Log: fixes upstream issues #364, update test phase(s) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.2 dev-python/kombu/kombu-3.0.19.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild?r1=1.1&r2=1.2 Index: kombu-3.0.19.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kombu-3.0.19.ebuild 16 Jun 2014 02:43:40 -0000 1.1 +++ kombu-3.0.19.ebuild 22 Jun 2014 08:32:46 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v 1.1 2014/06/16 02:43:40 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v 1.2 2014/06/22 08:32:46 idella4 Exp $ EAPI=5 @@ -48,6 +48,8 @@ REQUIRED_USE="sqs? ( ${PY27_REQUSE} ) doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are only py2 capable +PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch ) + python_prepare_all() { https://github.com/celery/kombu/issues/246 sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py @@ -64,17 +66,15 @@ python_test() { export DJANGO_SETTINGS_MODULE="django.conf" - # https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file if python_is_python3; then 2to3 --no-diffs -w build/lib/kombu/transport/ - nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" + nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}" else - nosetests "${S}"/kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" + 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. if [[ "${EPYTHON}" == python2.7 ]]; then pushd funtests > /dev/null - # For now, use nosetests manually, return to esetup.py on fixing of issues/364 - nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" + esetup.py test popd > /dev/null fi fi 1.2 dev-python/kombu/kombu-3.0.18.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild?r1=1.1&r2=1.2 Index: kombu-3.0.18.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kombu-3.0.18.ebuild 7 Jun 2014 12:27:11 -0000 1.1 +++ kombu-3.0.18.ebuild 22 Jun 2014 08:32:46 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v 1.1 2014/06/07 12:27:11 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v 1.2 2014/06/22 08:32:46 idella4 Exp $ EAPI=5 @@ -47,6 +47,7 @@ PY27_REQUSE="$(python_gen_useflags 'python2.7')" REQUIRED_USE="sqs? ( ${PY27_REQUSE} ) doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are only py2 capable +PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch ) python_prepare_all() { https://github.com/celery/kombu/issues/246 @@ -64,16 +65,14 @@ python_test() { export DJANGO_SETTINGS_MODULE="django.conf" - # https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file if python_is_python3; then 2to3 --no-diffs -w build/lib/kombu/transport/ - nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" + nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}" else # funtests appears to be coded only for py2, a kind of 2nd tier. - nosetests "${S}"/kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" + nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}" pushd funtests > /dev/null - # For now, use nosetests manually, return to esetup.py on fixing of issues/364 - nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" + esetup.py test popd > /dev/null fi } 1.37 dev-python/kombu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?r1=1.36&r2=1.37 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ChangeLog 16 Jun 2014 02:43:40 -0000 1.36 +++ ChangeLog 22 Jun 2014 08:32:46 -0000 1.37 @@ -1,6 +1,10 @@ # ChangeLog for dev-python/kombu # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.36 2014/06/16 02:43:40 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.37 2014/06/22 08:32:46 idella4 Exp $ + + 22 Jun 2014; Ian Delaney <idel...@gentoo.org> +files/kombu-NA-tests-fix.patch, + kombu-3.0.18.ebuild, kombu-3.0.19.ebuild: + fixes upstream issues #364, update test phase(s) *kombu-3.0.18 (07 Jun 2014)
