[SCM] Packaging for numexpr branch, master, updated. debian/1.4.2-3.2-1-g64eb51e
Antonio Valentino
antonio.valentino at tiscali.it
Sun Mar 4 20:37:28 UTC 2012
The following commit has been merged in the master branch:
commit 64eb51eb92697ef898b0d13db1a65a3bf913d11f
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Sun Mar 4 21:22:21 2012 +0100
Improved pach for fixing FTBFS on Hurd and KFreeBSD
diff --git a/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch b/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
index e170482..d09923e 100644
--- a/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
+++ b/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
@@ -8,19 +8,26 @@ Subject: feature forwarded upstream fix FTBFS on Hurd and KFreeBSD
numexpr/tests/test_numexpr.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
-diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
-index 4dfffaf..feafa1c 100644
--- a/numexpr/tests/test_numexpr.py
+++ b/numexpr/tests/test_numexpr.py
-@@ -586,6 +586,11 @@ def _worker(qout = None):
- class test_subprocess(TestCase):
- def test_multiprocess(self):
- import multiprocessing as mp
-+ import platform as pl
+@@ -634,6 +634,7 @@
+
+ def suite():
+ import unittest
++ import platform as pl
+
+ theSuite = unittest.TestSuite()
+ niter = 1
+@@ -656,7 +657,11 @@
+ theSuite.addTest(unittest.makeSuite(test_strings))
+ theSuite.addTest(
+ unittest.makeSuite(test_irregular_stride) )
+- theSuite.addTest(unittest.makeSuite(test_subprocess))
+
-+ if (pl.system().lower() in ('gnu', 'gnu/kfreebsd')):
-+ return Skip("multiprocessing module is not supported on Hurd/kFreeBSD")
++ # multiprocessing module is not supported on Hurd/kFreeBSD
++ if (pl.system().lower() not in ('gnu', 'gnu/kfreebsd')):
++ theSuite.addTest(unittest.makeSuite(test_subprocess))
+
- # Check for two threads at least
- numexpr.set_num_threads(2)
- #print "**** Running from main process:"
+ # I need to put this test after test_subprocess because
+ # if not, the test suite locks immediately before test_subproces.
+ # This only happens with Windows, so I suspect of a subtle bad
--
Packaging for numexpr
More information about the debian-science-commits
mailing list