summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2013-04-30 13:00:12 +0000
committerIan Delaney <idella4@gentoo.org>2013-04-30 13:00:12 +0000
commitb82f284af41e0c3b2387abddc127626bfed9f023 (patch)
tree6648f58096588c5ce91e419ba828a5f3c4d585ed /dev-python/sqlalchemy
parentx11-terms/terminator: Version Bump (diff)
downloadgentoo-2-b82f284af41e0c3b2387abddc127626bfed9f023.tar.gz
gentoo-2-b82f284af41e0c3b2387abddc127626bfed9f023.tar.bz2
gentoo-2-b82f284af41e0c3b2387abddc127626bfed9f023.zip
0.7.10, correct install phase. 0.8.0; Add py3, pypy support in exchange of dropping IUSE firebird mssql mysql postgres, dep list adjusted accordingly, -fno-strict-aliasing set excluded for py3, python_test adjusted accordingly, install phase reduced using vars, postinst added offsetting dropping use flags & informing user via elog && has_version
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-python/sqlalchemy')
-rw-r--r--dev-python/sqlalchemy/ChangeLog10
-rw-r--r--dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild4
-rw-r--r--dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild71
3 files changed, 50 insertions, 35 deletions
diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 7f7341d82a97..9398beb781b8 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.99 2013/03/19 03:06:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.100 2013/04/30 13:00:12 idella4 Exp $
+
+ 30 Apr 2013; Ian Delaney <idella4@gentoo.org> sqlalchemy-0.7.10.ebuild,
+ sqlalchemy-0.8.0.ebuild:
+ 0.7.10, correct install phase. 0.8.0; Add py3, pypy support in exchange of
+ dropping IUSE firebird mssql mysql postgres, dep list adjusted accordingly,
+ -fno-strict-aliasing set excluded for py3, python_test adjusted accordingly,
+ install phase reduced using vars, postinst added offsetting dropping use flags
+ & informing user via elog && has_version
19 Mar 2013; Mike Gilbert <floppym@gentoo.org> sqlalchemy-0.8.0.ebuild:
Fixup deps and python_install_all function. Enable parallel build, but disable
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
index 5bb6e473a3ca..d6b9ba80ba8a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -1,6 +1,6 @@
# 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.2 2013/02/27 20:22:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild,v 1.3 2013/04/30 13:00:12 idella4 Exp $
EAPI=5
# py3 appears underdone,
@@ -54,7 +54,7 @@ python_test() {
"${PYTHON}" sqla_nose.py || die
}
-src_install_all() {
+python_install_all() {
if use doc; then
pushd doc > /dev/null
rm -fr build
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
index 7cfb9b0a6e1c..bce98f35714b 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
@@ -1,10 +1,9 @@
# 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.8.0.ebuild,v 1.2 2013/03/19 03:06:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild,v 1.3 2013/04/30 13:00:12 idella4 Exp $
EAPI=5
-# py3 appears underdone,
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
inherit distutils-r1 eutils flag-o-matic
@@ -19,15 +18,11 @@ 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"
+IUSE="doc examples +sqlite test"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- firebird? ( dev-python/kinterbasdb )
- mssql? ( dev-python/pymssql )
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- sqlite? (
- >=dev-db/sqlite-3.3.13 )"
+ sqlite? ( >=dev-db/sqlite-3.3.13 )"
+
DEPEND="${RDEPEND}
test? (
>=dev-db/sqlite-3.3.13
@@ -36,38 +31,50 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
-python_prepare_all() {
+# Required for testsuite, mainly py3
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare() {
# Disable tests hardcoding function call counts specific to Python versions.
- rm -fr test/aaa_profiling
- distutils-r1_python_prepare_all
+ if [[ "${EPYTHON}" == 'python2.6' ]]; then
+ rm -fr test/aaa_profiling
+ fi
}
-python_configure_all() {
- # Make sure to disable this if python3 support is added.
- append-flags -fno-strict-aliasing
+python_configure() {
+ if [[ "${EPYTHON}" != python3* ]]; then
+ append-flags -fno-strict-aliasing
+ fi
}
python_test() {
- "${PYTHON}" sqla_nose.py || die
+ # No longer has postgresql support
+ if [[ "${EPYTHON}" == python3* ]]; then
+ "${PYTHON}" sa2to3.py --no-diffs -w lib test examples
+ fi
+ "${PYTHON}" sqla_nose.py -I test_postgresql* || die
}
-src_test() {
- # Possible problem in test.ext.test_serializer.SerializeTest.test_query
- # AssertionError: desired statement count 1 does not match 2
- # Investigate if you are bored.
- DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+python_install_all() {
+ use doc && HTML_DOCS=( doc/. )
+
+ use examples && local EXAMPLES=( examples )
+
+ distutils-r1_python_install_all
}
-python_install_all() {
- if use doc; then
- pushd doc > /dev/null
- rm -fr build
- dohtml -r [a-z]* _images _static
- popd > /dev/null
- fi
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if ! has_version dev-python/mysql-python; then
+ elog "For MySQL support, install dev-python/mysql-python"
+ fi
+
+ if ! has_version dev-python/pymssql; then
+ elog "For mssql support, install dev-python/pymssql"
+ fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
+ if ! has_version dev-python/psycopg:2; then
+ elog "For postgresql support, install dev-python/psycopg:2"
+ fi
fi
}