[SCM] Packaging for pytables branch, master, updated. debian/2.4.0-1-38-gbf1413b

Antonio Valentino antonio.valentino at tiscali.it
Mon Jun 24 17:35:34 UTC 2013


The following commit has been merged in the master branch:
commit 7bed8c13d003a519a13cee13e4b7e162a7e4f11f
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Jun 24 16:54:16 2013 +0000

    Patches for fixing unit test failures on big-endian architectures

diff --git a/debian/changelog b/debian/changelog
index 36b7923..1b9282d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ pytables (2.4.0-3) UNRELEASED; urgency=low
 
   * Added build-deendency from jquery-cookie and updated debian/rules
     to avoid embedded javascript
+  * New patch: fix tests of nested record reperesentation on big-endian
+    machines.  Backport of upstream fix for gh-237 (see also
+    https://github.com/PyTables/PyTables/issues/237).
+  * New patch: fix detection od platforms supporting blosc
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 23 Jun 2013 14:14:23 +0000
 
diff --git a/debian/patches/0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch b/debian/patches/0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch
new file mode 100644
index 0000000..d4629db
--- /dev/null
+++ b/debian/patches/0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch
@@ -0,0 +1,35 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 24 Jun 2013 05:59:00 +0000
+Subject: Fix tests of nested record reperesentation on big-endian machines.
+
+Backport of upstream fix for gh-237 (see also
+https://github.com/PyTables/PyTables/issues/237).
+---
+ tables/tests/test_nestedtypes.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tables/tests/test_nestedtypes.py b/tables/tests/test_nestedtypes.py
+index 7ec7ea2..524bbc7 100644
+--- a/tables/tests/test_nestedtypes.py
++++ b/tables/tests/test_nestedtypes.py
+@@ -816,15 +816,15 @@ class ColsTestCase(common.TempFileMixin, common.PyTablesTestCase):
+ )
+         except AssertionError:
+             self.assertEqual(repr(tbl.cols),
+-"""/test.cols (Cols), 6 columns
+-  x (Column(0, 2), ('<i4', (2,)))
++                             """/test.cols (Cols), 6 columns
++  x (Column(0, 2), ('%s', (2,)))
+   Info (Cols(), Description)
+   color (Column(0,), |S2)
+   info (Cols(), Description)
+-  y (Column(0, 2, 2), ('<f8', (2, 2)))
++  y (Column(0, 2, 2), ('%s', (2, 2)))
+   z (Column(0,), uint8)
+-"""
+-)
++""" % (numpy.int32(0).dtype.str, numpy.float64(0).dtype.str)
++                             )
+ 
+     def test00b_repr(self):
+         """Checking string representation of nested Cols."""
diff --git a/debian/patches/0002-Fix-detection-od-platforms-supporting-blosc.patch b/debian/patches/0002-Fix-detection-od-platforms-supporting-blosc.patch
new file mode 100644
index 0000000..524e3f0
--- /dev/null
+++ b/debian/patches/0002-Fix-detection-od-platforms-supporting-blosc.patch
@@ -0,0 +1,21 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 24 Jun 2013 18:47:32 +0200
+Subject: Fix detection od platforms supporting blosc
+
+---
+ tables/utilsExtension.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tables/utilsExtension.pyx b/tables/utilsExtension.pyx
+index 6a06af7..71db46b 100644
+--- a/tables/utilsExtension.pyx
++++ b/tables/utilsExtension.pyx
+@@ -124,7 +124,7 @@ def _arch_without_blosc():
+     for a in ["arm", "sparc", "mips"]:
+         if a in arch:
+             return True
+-        return False
++    return False
+ 
+ # Only register bloc compressor on platforms that actually support it.
+ if _arch_without_blosc():
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed2d21e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch
+0002-Fix-detection-od-platforms-supporting-blosc.patch

-- 
Packaging for pytables



More information about the debian-science-commits mailing list