* [gentoo-commits] gentoo-x86 commit in dev-python/enable: enable-4.1.0.ebuild enable-4.2.0.ebuild ChangeLog
@ 2012-11-29 10:53 Ian Delaney (idella4)
0 siblings, 0 replies; only message in thread
From: Ian Delaney (idella4) @ 2012-11-29 10:53 UTC (permalink / raw
To: gentoo-commits
idella4 12/11/29 10:53:21
Modified: enable-4.1.0.ebuild enable-4.2.0.ebuild ChangeLog
Log:
Fixes to test suites in 4.1,2.0, special patch saved to devspace to make workable mix of correct and wrong import paths, skirt 1 invalid test, set 2 tests to xfail, fixes Bug #422945
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path
1.4 dev-python/enable/enable-4.1.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild?r1=1.3&r2=1.4
Index: enable-4.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- enable-4.1.0.ebuild 7 Aug 2012 04:03:10 -0000 1.3
+++ enable-4.1.0.ebuild 29 Nov 2012 10:53:21 -0000 1.4
@@ -1,18 +1,20 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.3 2012/08/07 04:03:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.4 2012/11/29 10:53:21 idella4 Exp $
EAPI=4
-
+PYTHON_DEPEND="2:2.6"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils eutils virtualx
DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
+ http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"
LICENSE="BSD"
SLOT="0"
@@ -37,13 +39,23 @@
DOCS="docs/*.txt"
+src_prepare() {
+ distutils_src_prepare
+
+ # Remove check for Darwin systems, set py.test style xfails,
+ # Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
+ epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
+ "${FILESDIR}"/${PN}-4-rogue-tests.patch
+}
+
src_compile() {
distutils_src_compile
use doc && emake -C docs html
}
src_test() {
- VIRTUALX_COMMAND="distutils_src_test" virtualmake
+ # Hardcoding build-2.7, 2.7 being the only fully capable candidate
+ VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
}
src_install() {
1.2 dev-python/enable/enable-4.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild?r1=1.1&r2=1.2
Index: enable-4.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enable-4.2.0.ebuild 9 Oct 2012 09:22:56 -0000 1.1
+++ enable-4.2.0.ebuild 29 Nov 2012 10:53:21 -0000 1.2
@@ -1,18 +1,20 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.1 2012/10/09 09:22:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.2 2012/11/29 10:53:21 idella4 Exp $
EAPI=4
-
+PYTHON_DEPEND="2:2.6"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils eutils virtualx
DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
+ http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"
LICENSE="BSD"
SLOT="0"
@@ -37,13 +39,23 @@
DOCS="docs/*.txt"
+src_prepare() {
+ distutils_src_prepare
+
+ # Remove check for Darwin systems, set py.test style xfails,
+ # Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
+ epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
+ "${FILESDIR}"/${PN}-4-rogue-tests.patch
+}
+
src_compile() {
distutils_src_compile
use doc && emake -C docs html
}
src_test() {
- VIRTUALX_COMMAND="distutils_src_test" virtualmake
+ # Hardcoding build-2.7, 2.7 being the only fully capable candidate
+ VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
}
src_install() {
1.19 dev-python/enable/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 9 Oct 2012 09:22:56 -0000 1.18
+++ ChangeLog 29 Nov 2012 10:53:21 -0000 1.19
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/enable
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.18 2012/10/09 09:22:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.19 2012/11/29 10:53:21 idella4 Exp $
+
+ 30 Nov 2012; Ian Delaney <idella4@gentoo.org>
+ +files/enable-4-rogue-tests.patch, enable-4.1.0.ebuild, enable-4.2.0.ebuild:
+ Fixes to test suites in 4.1,2.0, special patch saved to devspace to make
+ workable mix of correct and wrong import paths, skirt 1 invalid test, set 2
+ tests to xfail, fixes Bug #422945
*enable-4.2.0 (09 Oct 2012)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-11-29 10:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 10:53 [gentoo-commits] gentoo-x86 commit in dev-python/enable: enable-4.1.0.ebuild enable-4.2.0.ebuild ChangeLog Ian Delaney (idella4)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox