1 |
floppym 13/10/31 04:51:56 |
2 |
|
3 |
Modified: sqlalchemy-0.8.2.ebuild ChangeLog |
4 |
Log: |
5 |
Rearrange python_test to avoid calling 2to3 on source tree twice, bug 489518. As a side effect, we can disable in-source builds. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: sqlalchemy-0.8.2.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- sqlalchemy-0.8.2.ebuild 5 Sep 2013 18:47:11 -0000 1.4 |
23 |
+++ sqlalchemy-0.8.2.ebuild 31 Oct 2013 04:51:56 -0000 1.5 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v 1.4 2013/09/05 18:47:11 mgorny Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v 1.5 2013/10/31 04:51:56 floppym Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) |
32 |
@@ -32,14 +32,10 @@ |
33 |
|
34 |
S="${WORKDIR}/${MY_P}" |
35 |
|
36 |
-# Required for testsuite, mainly py3 |
37 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
38 |
- |
39 |
-python_prepare() { |
40 |
+python_prepare_all() { |
41 |
# Disable tests hardcoding function call counts specific to Python versions. |
42 |
- if [[ "${EPYTHON}" == 'python2.5' || "${EPYTHON}" == 'python2.6' ]]; then |
43 |
- rm -fr test/aaa_profiling |
44 |
- fi |
45 |
+ rm -r test/aaa_profiling || die |
46 |
+ distutils-r1_python_prepare_all |
47 |
} |
48 |
|
49 |
python_compile() { |
50 |
@@ -51,11 +47,15 @@ |
51 |
} |
52 |
|
53 |
python_test() { |
54 |
+ # Create copies of necessary files in BUILD_DIR. |
55 |
+ cp -pR examples sa2to3.py sqla_nose.py setup.cfg test "${BUILD_DIR}" || die |
56 |
+ pushd "${BUILD_DIR}" || die |
57 |
if python_is_python3; then |
58 |
- "${PYTHON}" sa2to3.py --no-diffs -w lib test examples |
59 |
+ "${PYTHON}" sa2to3.py --no-diffs -w examples test || die |
60 |
fi |
61 |
# No longer has postgresql support |
62 |
"${PYTHON}" sqla_nose.py -I test_postgresql || die "Testsuite failed under ${EPYTHON}" |
63 |
+ popd || die |
64 |
} |
65 |
|
66 |
python_install_all() { |
67 |
|
68 |
|
69 |
|
70 |
1.109 dev-python/sqlalchemy/ChangeLog |
71 |
|
72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sqlalchemy/ChangeLog?rev=1.109&view=markup |
73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sqlalchemy/ChangeLog?rev=1.109&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sqlalchemy/ChangeLog?r1=1.108&r2=1.109 |
75 |
|
76 |
Index: ChangeLog |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v |
79 |
retrieving revision 1.108 |
80 |
retrieving revision 1.109 |
81 |
diff -u -r1.108 -r1.109 |
82 |
--- ChangeLog 30 Sep 2013 15:31:43 -0000 1.108 |
83 |
+++ ChangeLog 31 Oct 2013 04:51:56 -0000 1.109 |
84 |
@@ -1,6 +1,10 @@ |
85 |
# ChangeLog for dev-python/sqlalchemy |
86 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.108 2013/09/30 15:31:43 floppym Exp $ |
88 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.109 2013/10/31 04:51:56 floppym Exp $ |
89 |
+ |
90 |
+ 31 Oct 2013; Mike Gilbert <floppym@g.o> sqlalchemy-0.8.2.ebuild: |
91 |
+ Rearrange python_test to avoid calling 2to3 on source tree twice, bug 489518. |
92 |
+ As a side effect, we can disable in-source builds. |
93 |
|
94 |
30 Sep 2013; Mike Gilbert <floppym@g.o> sqlalchemy-0.7.10.ebuild: |
95 |
Call distutils-r1_python_install_all |