bump, drop py25; Added -logging.patch, fixes import errors in test for 0.7.9 & 0.7.10, closes #Bug 458686

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

4 files changed, 226 insertions, 4 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 81b4e80b61fd..386cf272c8ff 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.95 2013/02/24 17:48:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.96 2013/02/26 16:29:48 idella4 Exp $
+
+*sqlalchemy-0.7.10 (26 Feb 2013)
+
+  26 Feb 2013; Ian Delaney <idella4@gentoo.org>
+  +files/sqlalchemy-0.7-logging.patch, +sqlalchemy-0.7.10.ebuild,
+  sqlalchemy-0.7.9.ebuild:
+  bump, drop py25; Added -logging.patch, fixes import errors in test for 0.7.9 &
+  0.7.10, closes #Bug 458686
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> sqlalchemy-0.7.9.ebuild:
   Stable for sh, wrt bug #449426
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.patch b/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.patch
new file mode 100644
index 000000000000..ab01c515fc88
--- /dev/null
+++ b/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.patch
@@ -0,0 +1,143 @@
+Some odd reason usual import logging doesn't work; matches import of other modules in test_execute.py
+diff -ur SQLAlchemy-0.7.9.orig/test/engine/test_execute.py SQLAlchemy-0.7.9/test/engine/test_execute.py
+--- test/engine/test_execute.py	2012-10-02 06:33:29.000000000 +0800
++++ test/engine/test_execute.py	2013-02-26 16:13:44.923958389 +0800
+@@ -9,7 +9,7 @@
+ import sqlalchemy as tsa
+ from test.lib import testing, engines
+ from test.lib.engines import testing_engine
+-import logging
++from logging import handlers, getLogger, DEBUG, INFO, WARN
+ from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
+ from sqlalchemy.engine import base, default
+ from sqlalchemy.engine.base import Connection, Engine
+@@ -542,18 +542,18 @@
+     def setup(self):
+         self.eng = engines.testing_engine(options={'echo':True})
+         self.eng.execute("create table foo (data string)")
+-        self.buf = logging.handlers.BufferingHandler(100)
++        self.buf = handlers.BufferingHandler(100)
+         for log in [
+-            logging.getLogger('sqlalchemy.engine'),
+-            logging.getLogger('sqlalchemy.pool')
++            getLogger('sqlalchemy.engine'),
++            getLogger('sqlalchemy.pool')
+         ]:
+             log.addHandler(self.buf)
+ 
+     def teardown(self):
+         self.eng.execute("drop table foo")
+         for log in [
+-            logging.getLogger('sqlalchemy.engine'),
+-            logging.getLogger('sqlalchemy.pool')
++            getLogger('sqlalchemy.engine'),
++            getLogger('sqlalchemy.pool')
+         ]:
+             log.removeHandler(self.buf)
+ 
+@@ -646,17 +646,17 @@
+         return engines.testing_engine(options=kw)
+ 
+     def setup(self):
+-        self.buf = logging.handlers.BufferingHandler(100)
++        self.buf = handlers.BufferingHandler(100)
+         for log in [
+-            logging.getLogger('sqlalchemy.engine'),
+-            logging.getLogger('sqlalchemy.pool')
++            getLogger('sqlalchemy.engine'),
++            getLogger('sqlalchemy.pool')
+         ]:
+             log.addHandler(self.buf)
+ 
+     def teardown(self):
+         for log in [
+-            logging.getLogger('sqlalchemy.engine'),
+-            logging.getLogger('sqlalchemy.pool')
++            getLogger('sqlalchemy.engine'),
++            getLogger('sqlalchemy.pool')
+         ]:
+             log.removeHandler(self.buf)
+ 
+@@ -703,14 +703,14 @@
+     __requires__ = 'ad_hoc_engines',
+ 
+     def setup(self):
+-        self.level = logging.getLogger('sqlalchemy.engine').level
+-        logging.getLogger('sqlalchemy.engine').setLevel(logging.WARN)
+-        self.buf = logging.handlers.BufferingHandler(100)
+-        logging.getLogger('sqlalchemy.engine').addHandler(self.buf)
++        self.level = getLogger('sqlalchemy.engine').level
++        getLogger('sqlalchemy.engine').setLevel(WARN)
++        self.buf = handlers.BufferingHandler(100)
++        getLogger('sqlalchemy.engine').addHandler(self.buf)
+ 
+     def teardown(self):
+-        logging.getLogger('sqlalchemy.engine').removeHandler(self.buf)
+-        logging.getLogger('sqlalchemy.engine').setLevel(self.level)
++        getLogger('sqlalchemy.engine').removeHandler(self.buf)
++        getLogger('sqlalchemy.engine').setLevel(self.level)
+ 
+     def testing_engine(self):
+         e = engines.testing_engine()
+@@ -727,26 +727,26 @@
+ 
+         eq_(e1._should_log_info(), False)
+         eq_(e1._should_log_debug(), False)
+-        eq_(e1.logger.isEnabledFor(logging.INFO), False)
+-        eq_(e1.logger.getEffectiveLevel(), logging.WARN)
++        eq_(e1.logger.isEnabledFor(INFO), False)
++        eq_(e1.logger.getEffectiveLevel(), WARN)
+ 
+         e1.echo = True
+         eq_(e1._should_log_info(), True)
+         eq_(e1._should_log_debug(), False)
+-        eq_(e1.logger.isEnabledFor(logging.INFO), True)
+-        eq_(e1.logger.getEffectiveLevel(), logging.INFO)
++        eq_(e1.logger.isEnabledFor(INFO), True)
++        eq_(e1.logger.getEffectiveLevel(), INFO)
+ 
+         e1.echo = 'debug'
+         eq_(e1._should_log_info(), True)
+         eq_(e1._should_log_debug(), True)
+-        eq_(e1.logger.isEnabledFor(logging.DEBUG), True)
+-        eq_(e1.logger.getEffectiveLevel(), logging.DEBUG)
++        eq_(e1.logger.isEnabledFor(DEBUG), True)
++        eq_(e1.logger.getEffectiveLevel(), DEBUG)
+ 
+         e1.echo = False
+         eq_(e1._should_log_info(), False)
+         eq_(e1._should_log_debug(), False)
+-        eq_(e1.logger.isEnabledFor(logging.INFO), False)
+-        eq_(e1.logger.getEffectiveLevel(), logging.WARN)
++        eq_(e1.logger.isEnabledFor(INFO), False)
++        eq_(e1.logger.getEffectiveLevel(), WARN)
+ 
+     def test_echo_flag_independence(self):
+         """test the echo flag's independence to a specific engine."""
+diff -ur SQLAlchemy-0.7.10.orig/lib/sqlalchemy/util/langhelpers.py SQLAlchemy-0.7.10/lib/sqlalchemy/util/langhelpers.py
+--- lib/sqlalchemy/util/langhelpers.py	2013-02-08 08:10:48.000000000 +0800
++++ lib/sqlalchemy/util/langhelpers.py	2013-02-26 18:41:42.752032829 +0800
+@@ -619,10 +619,19 @@
+         if key == 'module':
+             raise ImportError("Could not resolve module %s"
+                                 % self._full_path)
+-        try:
+-            attr = getattr(self.module, key)
+-        except AttributeError:
+-            raise AttributeError(
++        if hasattr(sys, 'pypy_version_info'):
++            try:
++                attr = getattr(self.module, key)
++            except TypeError:
++                raise TypeError(
++                        "Module %s has no attribute '%s'" %
++                        (self._full_path, key)
++                    )
++        else:
++            try:
++                attr = getattr(self.module, key)
++            except AttributeError:
++                raise AttributeError(
+                         "Module %s has no attribute '%s'" %
+                         (self._full_path, key)
+                     )
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
new file mode 100644
index 000000000000..7fbfc1fb4e8f
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild,v 1.1 2013/02/26 16:29:48 idella4 Exp $
+
+EAPI=5
+# py3 appears underdone, 
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd \
+	~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples firebird mssql mysql postgres +sqlite test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	firebird? ( dev-python/kinterbasdb )
+	mssql? ( dev-python/pymssql )
+	mysql? ( dev-python/mysql-python )
+	postgres? ( >=dev-python/psycopg-2 )
+	sqlite? (
+		>=dev-db/sqlite-3.3.13 )"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-db/sqlite-3.3.13
+		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
+	)"
+
+# py26 tests needs
+DISTUTILS_NO_PARALLEL_BUILD=1
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-0.7-logging.patch
+
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -fr test/aaa_profiling
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	"${PYTHON}" sqla_nose.py || die
+}
+
+src_install_all() {
+	if use doc; then
+		pushd doc > /dev/null
+		rm -fr build
+		dohtml -r [a-z]* _images _static
+		popd > /dev/null
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild
index 92e877656caf..1e4371ab171c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild,v 1.11 2013/02/24 17:48:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild,v 1.12 2013/02/26 16:29:48 idella4 Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython-* 2.7-pypy-*"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_}"
@@ -46,6 +46,7 @@ PYTHON_MODNAME="sqlalchemy"
 src_prepare() {
 	distutils_src_prepare
 
+	epatch "${FILESDIR}"/${PN}-0.7-logging.patch
 	# Disable tests hardcoding function call counts specific to Python versions.
 	rm -fr test/aaa_profiling
 }