| 1 |
idella4 14/06/22 08:32:46 |
| 2 |
|
| 3 |
Modified: kombu-3.0.19.ebuild kombu-3.0.18.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
fixes upstream issues #364, update test phase(s) |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/kombu/kombu-3.0.19.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: kombu-3.0.19.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- kombu-3.0.19.ebuild 16 Jun 2014 02:43:40 -0000 1.1 |
| 23 |
+++ kombu-3.0.19.ebuild 22 Jun 2014 08:32:46 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v 1.1 2014/06/16 02:43:40 idella4 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.19.ebuild,v 1.2 2014/06/22 08:32:46 idella4 Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -48,6 +48,8 @@ |
| 33 |
REQUIRED_USE="sqs? ( ${PY27_REQUSE} ) |
| 34 |
doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are only py2 capable |
| 35 |
|
| 36 |
+PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch ) |
| 37 |
+ |
| 38 |
python_prepare_all() { |
| 39 |
https://github.com/celery/kombu/issues/246 |
| 40 |
sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py |
| 41 |
@@ -64,17 +66,15 @@ |
| 42 |
|
| 43 |
python_test() { |
| 44 |
export DJANGO_SETTINGS_MODULE="django.conf" |
| 45 |
- # https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file |
| 46 |
if python_is_python3; then |
| 47 |
2to3 --no-diffs -w build/lib/kombu/transport/ |
| 48 |
- nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" |
| 49 |
+ nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}" |
| 50 |
else |
| 51 |
- nosetests "${S}"/kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" |
| 52 |
+ nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}" |
| 53 |
# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6. |
| 54 |
if [[ "${EPYTHON}" == python2.7 ]]; then |
| 55 |
pushd funtests > /dev/null |
| 56 |
- # For now, use nosetests manually, return to esetup.py on fixing of issues/364 |
| 57 |
- nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" |
| 58 |
+ esetup.py test |
| 59 |
popd > /dev/null |
| 60 |
fi |
| 61 |
fi |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.2 dev-python/kombu/kombu-3.0.18.ebuild |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild?rev=1.2&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild?rev=1.2&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild?r1=1.1&r2=1.2 |
| 70 |
|
| 71 |
Index: kombu-3.0.18.ebuild |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v |
| 74 |
retrieving revision 1.1 |
| 75 |
retrieving revision 1.2 |
| 76 |
diff -u -r1.1 -r1.2 |
| 77 |
--- kombu-3.0.18.ebuild 7 Jun 2014 12:27:11 -0000 1.1 |
| 78 |
+++ kombu-3.0.18.ebuild 22 Jun 2014 08:32:46 -0000 1.2 |
| 79 |
@@ -1,6 +1,6 @@ |
| 80 |
# Copyright 1999-2014 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v 1.1 2014/06/07 12:27:11 idella4 Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.18.ebuild,v 1.2 2014/06/22 08:32:46 idella4 Exp $ |
| 84 |
|
| 85 |
EAPI=5 |
| 86 |
|
| 87 |
@@ -47,6 +47,7 @@ |
| 88 |
PY27_REQUSE="$(python_gen_useflags 'python2.7')" |
| 89 |
REQUIRED_USE="sqs? ( ${PY27_REQUSE} ) |
| 90 |
doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are only py2 capable |
| 91 |
+PATCHES=( "${FILESDIR}"/${PN}-NA-tests-fix.patch ) |
| 92 |
|
| 93 |
python_prepare_all() { |
| 94 |
https://github.com/celery/kombu/issues/246 |
| 95 |
@@ -64,16 +65,14 @@ |
| 96 |
|
| 97 |
python_test() { |
| 98 |
export DJANGO_SETTINGS_MODULE="django.conf" |
| 99 |
- # https://github.com/celery/kombu/issues/364. Cleaner for now to ignore the whole test_ file |
| 100 |
if python_is_python3; then |
| 101 |
2to3 --no-diffs -w build/lib/kombu/transport/ |
| 102 |
- nosetests --py3where=build/lib kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" |
| 103 |
+ nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}" |
| 104 |
else |
| 105 |
# funtests appears to be coded only for py2, a kind of 2nd tier. |
| 106 |
- nosetests "${S}"/kombu/tests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" |
| 107 |
+ nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}" |
| 108 |
pushd funtests > /dev/null |
| 109 |
- # For now, use nosetests manually, return to esetup.py on fixing of issues/364 |
| 110 |
- nosetests -I test_amqplib.py || die "Tests failed under ${EPYTHON}" |
| 111 |
+ esetup.py test |
| 112 |
popd > /dev/null |
| 113 |
fi |
| 114 |
} |
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.37 dev-python/kombu/ChangeLog |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.37&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?rev=1.37&content-type=text/plain |
| 122 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/kombu/ChangeLog?r1=1.36&r2=1.37 |
| 123 |
|
| 124 |
Index: ChangeLog |
| 125 |
=================================================================== |
| 126 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v |
| 127 |
retrieving revision 1.36 |
| 128 |
retrieving revision 1.37 |
| 129 |
diff -u -r1.36 -r1.37 |
| 130 |
--- ChangeLog 16 Jun 2014 02:43:40 -0000 1.36 |
| 131 |
+++ ChangeLog 22 Jun 2014 08:32:46 -0000 1.37 |
| 132 |
@@ -1,6 +1,10 @@ |
| 133 |
# ChangeLog for dev-python/kombu |
| 134 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 135 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.36 2014/06/16 02:43:40 idella4 Exp $ |
| 136 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.37 2014/06/22 08:32:46 idella4 Exp $ |
| 137 |
+ |
| 138 |
+ 22 Jun 2014; Ian Delaney <idella4@g.o> +files/kombu-NA-tests-fix.patch, |
| 139 |
+ kombu-3.0.18.ebuild, kombu-3.0.19.ebuild: |
| 140 |
+ fixes upstream issues #364, update test phase(s) |
| 141 |
|
| 142 |
*kombu-3.0.18 (07 Jun 2014) |
Archives