Add py3.3, drop py3.1 & pypy support, drop dep simplejson, tidied up dep list, set in source build req'd for tests, unrestricted test, overhauled doc build & test phase

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

2 files changed, 37 insertions, 30 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index ca96765135a2..5231eeace219 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.23 2013/04/24 06:54:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.24 2013/04/28 01:04:01 idella4 Exp $
+
+  28 Apr 2013; Ian Delaney <idella4@gentoo.org> kombu-2.5.10.ebuild:
+  Add py3.3, drop py3.1 & pypy support, drop dep simplejson, tidied up dep list,
+  set in source build req'd for tests, unrestricted test, overhauled doc build &
+  test phase
 
 *kombu-2.5.10 (24 Apr 2013)
 
diff --git a/dev-python/kombu/kombu-2.5.10.ebuild b/dev-python/kombu/kombu-2.5.10.ebuild
index 29d0a7cc01aa..2eb5f81676b7 100644
--- a/dev-python/kombu/kombu-2.5.10.ebuild
+++ b/dev-python/kombu/kombu-2.5.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.10.ebuild,v 1.1 2013/04/24 06:54:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.10.ebuild,v 1.2 2013/04/28 01:04:01 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 inherit distutils-r1
 
@@ -18,52 +18,54 @@ KEYWORDS="~amd64 ~x86"
 IUSE="amqplib doc examples test"
 
 RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
-	>=dev-python/py-amqp-1.0.6[${PYTHON_USEDEP}]"
+		>=dev-python/py-amqp-1.0.6[${PYTHON_USEDEP}]
+		amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/simplejson[$(python_gen_usedep python2_7),$(python_gen_usedep pypy{1_9,2_0})]
-	dev-python/anyjson[${PYTHON_USEDEP}]
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/pymongo[$(python_gen_usedep python2_7),$(python_gen_usedep pypy{1_9,2_0})]
-	dev-python/msgpack[$(python_gen_usedep python2_7),$(python_gen_usedep python{3_1,3_2})] )
+		>=dev-python/mock-0.7[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/pymongo[$(python_gen_usedep python2_7)]
+		dev-python/msgpack[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/django[$(python_gen_usedep python{2_7,3_2})]
-	dev-python/beanstalkc[$(python_gen_usedep python2_7)]
-	dev-python/couchdb-python[$(python_gen_usedep python2_7)] )
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/beanstalkc[$(python_gen_usedep python2_7)]
+		dev-python/couchdb-python[$(python_gen_usedep python2_7)] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-RESTRICT="test"
 
-python_compile() {
-	local SPHINXBUILD
-	# This will force sphinx-build to use python2.7
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
 	if use doc; then
-		if [[ "${EPYTHON}" == 'python2.7' ]]; then
-			local EPYTHON="python2.7"
-			export EPYTHON
-			einfo "building docs for kombu with python2.7"
-			PYTHONPATH="${S}" emake -C docs html || die "kombu docs failed installation"
-		fi
+		emake -C docs html || die "kombu docs failed installation"
 	fi
-	distutils-r1_python_compile
 }
 
+# wip; https://github.com/celery/kombu/issues/227; at this point upstr. maintainer established these tests 
+# 'can and do' pass, acks their failing 'on Travis' and offers neither a solution nor any plan to make 1.
 python_test() {
-# wip; https://github.com/celery/kombu/issues/227
-#	if [[ "${EPYTHON}" != python3* ]]; then
-		nosetests -e 'test_basic_consume_registers_ack_status*' -e 'test_close_resolves_connection_cycle*' \
-			-e 'test_init*' -e 'test_message_to_python*' -e 'test_prepare_message*' \
+	if [[ "${EPYTHON}" == python3* ]]; then
+		nosetests --py3where=build/lib -e test_basic_consume_registers_ack_status \
+			-e test_close_resolves_connection_cycle -e test_init \
+			-e test_message_to_python -e test_prepare_message \
+			-e test_produce_consume -e test_produce_consume_noack kombu/tests \
 			|| die "Tests failed under ${EPYTHON}"
-#	fi
+	else
+		nosetests -e test_basic_consume_registers_ack_status -e test_close_resolves_connection_cycle \
+			-e test_init -e test_message_to_python -e test_prepare_message \
+			|| die "Tests failed under ${EPYTHON}"		
+	fi
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
+
 	if use examples; then
 		docompress -x usr/share/doc/${P}/examples/
 		insinto usr/share/doc/${PF}/
 		doins -r examples/
 	fi
+
 	use doc && dohtml -r docs/.build/html/
 }