[h5py] 02/03: cherry-picked '1155a02f Explicity specify endianess of expected output type' into 'patched'

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository h5py.

commit 1aeeb569d8d451716294f1a8e6ca60b09c18896f
Merge: ee08c31 345ac5c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jan 12 12:21:34 2017 +0000

    cherry-picked '1155a02f Explicity specify endianess of expected output type' into 'patched'

 debian/.git-dpm                                    |  4 +-
 ...specify-endianess-of-expected-output-type.patch | 73 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 h5py/tests/old/test_h5t.py                         | 26 ++++----
 4 files changed, 89 insertions(+), 15 deletions(-)

diff --cc debian/.git-dpm
index 54c3315,0000000..cbecd91
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 19fb129d7c046d9abb69c72277a54c1a1bc57ad9
- 19fb129d7c046d9abb69c72277a54c1a1bc57ad9
++345ac5c1626568307de6ecbad40f196db8c4d685
++345ac5c1626568307de6ecbad40f196db8c4d685
 +aa2d362fff97e9ab820932f646243c8b84377a05
 +aa2d362fff97e9ab820932f646243c8b84377a05
 +h5py_2.7.0~rc2.orig.tar.gz
 +53b16e3e770f087efc9f110082dedd87484f7a55
 +264689
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Explicity-specify-endianess-of-expected-output-type.patch
index 0000000,0000000..2c3823c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Explicity-specify-endianess-of-expected-output-type.patch
@@@ -1,0 -1,0 +1,73 @@@
++From 345ac5c1626568307de6ecbad40f196db8c4d685 Mon Sep 17 00:00:00 2001
++From: Martin Raspaud <martin.raspaud at smhi.se>
++Date: Thu, 12 Jan 2017 12:06:13 +0100
++Subject: Explicity specify endianess of expected output type
++
++Signed-off-by: Martin Raspaud <martin.raspaud at smhi.se>
++---
++ h5py/tests/old/test_h5t.py | 26 +++++++++++++-------------
++ 1 file changed, 13 insertions(+), 13 deletions(-)
++
++diff --git a/h5py/tests/old/test_h5t.py b/h5py/tests/old/test_h5t.py
++index a263b73..aaf5ac5 100644
++--- a/h5py/tests/old/test_h5t.py
+++++ b/h5py/tests/old/test_h5t.py
++@@ -30,8 +30,8 @@ class TestCompound(ut.TestCase):
++         """ Reference types are correctly stored in compound types (issue 144)
++         """
++         ref = h5py.special_dtype(ref=h5py.Reference)
++-        dt = np.dtype([('a',ref),('b','<f4')])
++-        tid = h5t.py_create(dt,logical=True)
+++        dt = np.dtype([('a', ref), ('b', '<f4')])
+++        tid = h5t.py_create(dt, logical=True)
++         t1, t2 = tid.get_member_type(0), tid.get_member_type(1)
++         self.assertEqual(t1, h5t.STD_REF_OBJ)
++         self.assertEqual(t2, h5t.IEEE_F32LE)
++@@ -41,9 +41,9 @@ class TestCompound(ut.TestCase):
++     def test_out_of_order_offsets(self):
++         size = 20
++         type_dict = {
++-            'names' : ['f1', 'f2', 'f3'],
++-            'formats' : ['<f4', '<i4', '<f8'],
++-            'offsets' : [0, 16, 8]
+++            'names': ['f1', 'f2', 'f3'],
+++            'formats': ['<f4', '<i4', '<f8'],
+++            'offsets': [0, 16, 8]
++         }
++ 
++         expected_dtype = np.dtype(type_dict)
++@@ -183,26 +183,26 @@ class TestTypeFloatID(TestCase):
++ 
++         # ebias promotion to float32
++         values = f[dataset][:]
++-        self.assert_(np.all(values == wdata))
++-        self.assert_(values.dtype == np.float32)
+++        self.assertTrue(np.all(values == wdata))
+++        self.assertEqual(values.dtype, np.dtype('<f4'))
++ 
++         # esize promotion to float32
++         values = f[dataset2][:]
++-        self.assert_(np.all(values == wdata2))
++-        self.assert_(values.dtype == np.float32)
+++        self.assertTrue(np.all(values == wdata2))
+++        self.assertEqual(values.dtype, np.dtype('<f4'))
++ 
++         # regular half floats
++         dset = f[dataset3]
++         try:
++-            self.assert_(dset.dtype == np.float16)
+++            self.assertEqual(dset.dtype, np.dtype('<f2'))
++         except AttributeError:
++-            self.assert_(dset.dtype == np.float32)
+++            self.assertEqual(dset.dtype, np.dtype('<f4'))
++ 
++         # ebias promotion to float64
++         dset = f[dataset4]
++-        self.assert_(dset.dtype == np.float64)
+++        self.assertEqual(dset.dtype, np.dtype('<f8'))
++ 
++         # long double floats
++ 
++         dset = f[dataset5]
++-        self.assert_(dset.dtype == np.longdouble)
+++        self.assertEqual(dset.dtype, np.longdouble)
diff --cc debian/patches/series
index 1e2b1cb,0000000..876fdc3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Disable-usage-of-rpath.patch
++0002-Explicity-specify-endianess-of-expected-output-type.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git