drop py2.6 pypy2_0 add py3.4 support, minor tidy, upgrade test phase

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

2 files changed, 23 insertions, 10 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 6ab01cbd5d48..50dbd1e5aac8 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.141 2014/04/19 18:11:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.142 2014/05/08 05:41:50 idella4 Exp $
+
+  08 May 2014; Ian Delaney <idella4@gentoo.org> logilab-common-0.61.0.ebuild:
+  drop py2.6 pypy2_0 add py3.4 support, minor tidy, upgrade test phase
 
   19 Apr 2014; Michał Górny <mgorny@gentoo.org> logilab-common-0.61.0.ebuild:
   Use ${PYTHON_USEDEP} substitution support added to python_gen_cond_dep().
diff --git a/dev-python/logilab-common/logilab-common-0.61.0.ebuild b/dev-python/logilab-common/logilab-common-0.61.0.ebuild
index 85a85f4d6fef..f821d01b993b 100644
--- a/dev-python/logilab-common/logilab-common-0.61.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.61.0.ebuild
@@ -1,12 +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/logilab-common/logilab-common-0.61.0.ebuild,v 1.6 2014/04/19 18:11:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.61.0.ebuild,v 1.7 2014/05/08 05:41:50 idella4 Exp $
 
 EAPI=5
 
-# 0.60.0 fails unittest_umessage with python3.3
-# http://www.logilab.org/ticket/149345
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
 
 inherit distutils-r1 eutils
 
@@ -22,10 +20,8 @@ IUSE="test doc"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/python-unittest2[${PYTHON_USEDEP}]"
 
-# Tests using dev-python/psycopg are skipped when dev-python/psycopg
-# isn't installed.
-# egenix-mx-base tests are optional, and egenix-mx-base does support
-# Python2 only.
+# Tests using dev-python/psycopg are skipped when dev-python/psycopg isn't installed.
+# egenix-mx-base tests are optional and supports python2 only.
 DEPEND="${RDEPEND}
 	test? (
 		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' 'python2*')
@@ -41,6 +37,8 @@ PATCHES=(
 	# Depends on order of dictionary keys
 	"${FILESDIR}/logilab-common-0.60.0-skip-doctest.patch"
 )
+# Req'd for impl specific failures in the testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
 
 python_prepare_all() {
 	sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
@@ -65,8 +63,20 @@ python_test() {
 
 	# Make sure that the tests use correct modules.
 	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	if python_is_python3; then
+	# http://www.logilab.org/ticket/241813, 241807
+	# The suite can be made to pass under py3.4 by disabling the class MxDateTC in unittest_date.py
+	# These are covered by issue 241813.  Any and all methods to disable them temporarily
+	# (assuming they will ever be fixed) are simply cumbersome in the extreme, thus impractical.
+	# The failures are specific to py3.4's unittest's parameters in _addSkip and not the package itself.
+		if [[ "${EPYTHON}" == "python3.4" ]]; then
+			sed -e 's:test_any:_&:' \
+				-i $(find . -name unittest_compat.py) || die
+			sed -e 's:test_add_days_worked:_&:' \
+				-i $(find . -name unittest_date.py) || die
+		fi
 	#  Returns a clean run under py3.3
-	if [[ "${EPYTHON}" == 'python3.3' ]]; then
 		rm $(find . -name unittest_umessage.py) || die
 	fi
 	"${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}"