[Python-modules-commits] r34465 - in packages/pyfits/trunk/debian (3 files)

[aurel32 at users.alioth.debian.org]

    Date: Saturday, October 3, 2015 @ 11:00:53
  Author: aurel32
Revision: 34465

Add patches/05-checksum-32-bit.diff to fix a checksum issue on 32-bit
hosts.

Added:
  packages/pyfits/trunk/debian/patches/05-checksum-32-bit.diff
Modified:
  packages/pyfits/trunk/debian/changelog
  packages/pyfits/trunk/debian/patches/series

Modified: packages/pyfits/trunk/debian/changelog
===================================================================
--- packages/pyfits/trunk/debian/changelog	2015-10-03 10:07:34 UTC (rev 34464)
+++ packages/pyfits/trunk/debian/changelog	2015-10-03 11:00:53 UTC (rev 34465)
@@ -1,3 +1,10 @@
+pyfits (1:3.3-6) UNRELEASED; urgency=medium
+
+  * Add patches/05-checksum-32-bit.diff to fix a checksum issue on 32-bit
+    hosts.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 03 Oct 2015 13:00:21 +0200
+
 pyfits (1:3.3-5) unstable; urgency=medium
 
   * Add patches/03-testsuite-ignore-deprecated.diff to not trigger

Added: packages/pyfits/trunk/debian/patches/05-checksum-32-bit.diff
===================================================================
--- packages/pyfits/trunk/debian/patches/05-checksum-32-bit.diff	                        (rev 0)
+++ packages/pyfits/trunk/debian/patches/05-checksum-32-bit.diff	2015-10-03 11:00:53 UTC (rev 34465)
@@ -0,0 +1,33 @@
+--- pyfits-3.3.orig/lib/pyfits/hdu/base.py
++++ pyfits-3.3/lib/pyfits/hdu/base.py
+@@ -1542,8 +1542,8 @@ class _ValidHDU(_BaseHDU, _Verify):
+ 
+         hi = sum32 >> u16
+         lo = sum32 & uFFFF
+-        hi += np.add.reduce(data[0::2])
+-        lo += np.add.reduce(data[1::2])
++        hi += np.add.reduce(data[0::2], dtype=np.uint64)
++        lo += np.add.reduce(data[1::2], dtype=np.uint64)
+ 
+         if (data.nbytes // 2) % 2:
+             lo += last << u8
+--- pyfits-3.3.orig/lib/pyfits/tests/test_checksum.py
++++ pyfits-3.3/lib/pyfits/tests/test_checksum.py
+@@ -39,7 +39,7 @@ class TestChecksumFunctions(PyfitsTestCa
+         hdul.close()
+ 
+     def test_image_create(self):
+-        n = np.arange(100)
++        n = np.arange(100, dtype=np.int64)
+         hdu = fits.PrimaryHDU(n)
+         hdu.writeto(self.temp('tmp.fits'), clobber=True, checksum=True)
+         with fits.open(self.temp('tmp.fits'), checksum=True) as hdul:
+@@ -55,7 +55,7 @@ class TestChecksumFunctions(PyfitsTestCa
+                 assert hdul[0].header['DATASUM'] == '4950'
+ 
+     def test_nonstandard_checksum(self):
+-        hdu = fits.PrimaryHDU(np.arange(10.0 ** 6))
++        hdu = fits.PrimaryHDU(np.arange(10.0 ** 6, dtype=np.float64))
+         hdu.writeto(self.temp('tmp.fits'), clobber=True,
+                     checksum='nonstandard')
+         del hdu

Modified: packages/pyfits/trunk/debian/patches/series
===================================================================
--- packages/pyfits/trunk/debian/patches/series	2015-10-03 10:07:34 UTC (rev 34464)
+++ packages/pyfits/trunk/debian/patches/series	2015-10-03 11:00:53 UTC (rev 34465)
@@ -2,3 +2,4 @@
 02-fitscheck-exception.diff
 03-testsuite-ignore-deprecated.diff
 04-replace-inspect-by-funcsigs.diff
+05-checksum-32-bit.diff