Now skip tests for numarray and numeric, obsoleted

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 54 insertions, 10 deletions

diff --git a/dev-python/pytables/ChangeLog b/dev-python/pytables/ChangeLog
index 485824e80b1f..dae5f7121914 100644
--- a/dev-python/pytables/ChangeLog
+++ b/dev-python/pytables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pytables
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/ChangeLog,v 1.31 2009/12/12 16:26:37 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/ChangeLog,v 1.32 2010/01/19 16:49:23 bicatali Exp $
+
+  19 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  pytables-2.1.2.ebuild, +files/pytables-2.1.2-no-old-num.patch:
+  Now skip tests for numarray and numeric, obsoleted
 
 *pytables-2.1.2 (12 Dec 2009)
 
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 8d38fb635399..d41431d81f71 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX pytables-2.1.2-failingtests.patch 2384 RMD160 7788a07672356a781f20459c16fb3fa30216da91 SHA1 cff5b892d31f688207e9be0a93c683632b1afee9 SHA256 a20542e12cb42da9f352e2eddb6a9784d81b04ec11efe66e88c602cfde3383a6
+AUX pytables-2.1.2-no-old-num.patch 1683 RMD160 a458a67404a336d99e5fee832862af621106e77d SHA1 243784ec3da95836be00511130a44fa03c625c23 SHA256 6b795ba01a9988378b46e0c665a1aed110204c242d5f2a4e6005978819ebab74
 DIST tables-2.1.2.tar.gz 4677233 RMD160 09bfb73e9252baa34aa40274a0b07f6c6cc60d70 SHA1 545cc16491d37e2f6b8ce10bc8bdfa559b174e2e SHA256 948d80fb66693bca67863c4a7dc879dae1d6caa4235df0030ca0cc3220cffa39
-EBUILD pytables-2.1.2.ebuild 1122 RMD160 6d95e3685a1b377a289fd7bb77e90b966a36cf94 SHA1 c6db795314fd36ad3fdc81115e710a0e6f36278c SHA256 23319130c285219965ae0189bc43fb975c596c2bc361d4c2c9693b7662abdf68
-MISC ChangeLog 4685 RMD160 d1fee1cc816426cdf03300506c1bc4a14e8cd2dc SHA1 346e06a49012970009495500731a9fa528cd8a02 SHA256 f5cf6396790f2e1582e92197a8e772be354462799088c61e24e3d8a42eb69139
+EBUILD pytables-2.1.2.ebuild 1166 RMD160 c6b4bd94878b89a1b1532ecc0cd05ac2403f3b80 SHA1 c0bdc7d4e9cd2c849bb1b3d90e7b70abd8704cbb SHA256 5c57be0aa3df2a2759d863c274ff2727f6ad4bf4469b30f635280ab8c92a1992
+MISC ChangeLog 4859 RMD160 594c72616db706c2f119bbea79c50169cea8c62f SHA1 e13db7ddf510a12b62993b3d66ff576d3e01cd2a SHA256 d7619899e71c9e8a018c6fefd1cfaa4040e39fd68cf80670f40cb2a6499f7079
 MISC metadata.xml 612 RMD160 9d22d68fdb45ac4657d3eb763efa57768bf14264 SHA1 ea8e47129d3287e27ec0db1443527af7591470c2 SHA256 52c64e805b50f2888f7b68eb3a1ead40f0246d629a4a17b11507d8008d5351c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksjzXoACgkQ1ycZbhPLE2AQXwCeNXRJ+IWjWuY6gr1edBQ3zaxc
-+NsAn3xITmwRobGvtcCA/hqa2oyo1dL2
-=M/TI
+iEYEARECAAYFAktV6wkACgkQ1ycZbhPLE2DvowCglsfya8MFcEuQETOUo3nosCUh
+H7gAnjlSmjavrrlliAg/kkHaF2FEqbyy
+=w2sy
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytables/files/pytables-2.1.2-no-old-num.patch b/dev-python/pytables/files/pytables-2.1.2-no-old-num.patch
new file mode 100644
index 000000000000..9e86effc2d29
--- /dev/null
+++ b/dev-python/pytables/files/pytables-2.1.2-no-old-num.patch
@@ -0,0 +1,38 @@
+--- tables/tests/test_all.py.orig	2010-01-19 17:12:43.000000000 +0000
++++ tables/tests/test_all.py	2010-01-19 17:13:23.000000000 +0000
+@@ -51,35 +51,6 @@
+         test_modules.append('tables.tests.test_indexvalues')
+         test_modules.append('tables.tests.test_index_backcompat')
+ 
+-    # Add test_Numeric only if Numeric is installed
+-    if common.numeric_imported:
+-        import Numeric
+-        print "Numeric (version %s) is present. Adding the Numeric test suite." % \
+-              (Numeric.__version__)
+-        if Numeric.__version__ < minimum_numeric_version:
+-            print "*Warning*: Numeric version is lower than recommended: %s < %s" % \
+-                  (Numeric.__version__, minimum_numeric_version)
+-        test_modules.append("tables.tests.test_Numeric")
+-    else:
+-        print "Skipping Numeric test suite."
+-
+-    # Add test_numarray only if numarray is installed
+-    if common.numarray_imported:
+-        import numarray
+-        print \
+-"""numarray (version %s) is present. Adding the numarray test suite.""" % \
+-              (numarray.__version__)
+-        if numarray.__version__ < minimum_numarray_version:
+-            print \
+-"*Warning*: Numarray version is lower than recommended: %s < %s" % \
+-                  (numarray.__version__, minimum_numarray_version)
+-        test_modules.append("tables.tests.test_numarray")
+-        test_modules.append("tables.nra.tests.test_nestedrecords")
+-        test_modules.append("tables.nra.tests.test_nriterators")
+-    else:
+-        print "Skipping numarray test suite."
+-    print '-=' * 38
+-
+ 
+     # The test for garbage must be run *in the last place*.
+     # Else, it is not as useful.
diff --git a/dev-python/pytables/pytables-2.1.2.ebuild b/dev-python/pytables/pytables-2.1.2.ebuild
index 616c9cca8652..9f4084ca6d1c 100644
--- a/dev-python/pytables/pytables-2.1.2.ebuild
+++ b/dev-python/pytables/pytables-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-2.1.2.ebuild,v 1.1 2009/12/12 16:26:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-2.1.2.ebuild,v 1.2 2010/01/19 16:49:23 bicatali Exp $
 
 EAPI=2
 inherit eutils distutils
@@ -27,6 +27,7 @@ DOCS="ANNOUNCE.txt MIGRATING_TO_2.x.txt RELEASE_NOTES.txt THANKS"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-failingtests.patch
+	epatch "${FILESDIR}"/${P}-no-old-num.patch
 }
 
 src_test() {