[Python-modules-commits] [pyfits] 01/03: Add a patch from Ole Streicher to fix the testsuite with recent cfitsio versions (closes: #816595).

[Aurelien Jarno]

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

aurel32 pushed a commit to annotated tag debian/1%3.4-3
in repository pyfits.

commit d3a61734749ee76f6c70020a6c3fe602cf846f0c
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Sat Mar 12 22:31:25 2016 +0100

    Add a patch from Ole Streicher to fix the testsuite with recent cfitsio versions (closes: #816595).
---
 debian/changelog                             |  7 +++++
 debian/patches/03-fix-for-cfitsio-3380.patch | 43 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c73937..f0e3e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyfits (1:3.4-3) UNRELEASED; urgency=medium
+
+  * Add a patch from Ole Streicher to fix the testsuite with recent cfitsio
+    versions (closes: #816595).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 12 Mar 2016 21:09:51 +0100
+
 pyfits (1:3.4-2) unstable; urgency=medium
 
   * Update the description to mark pyfits as deprecated and suggest to
diff --git a/debian/patches/03-fix-for-cfitsio-3380.patch b/debian/patches/03-fix-for-cfitsio-3380.patch
new file mode 100644
index 0000000..d0fac84
--- /dev/null
+++ b/debian/patches/03-fix-for-cfitsio-3380.patch
@@ -0,0 +1,43 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Update image tests for cfitsio 3.380
+ Make TFORMx check more flexible. The maximal column length in cfitsio
+ changed between version 3370 and 3380. This patch checks their syntax,
+ without a specific length.
+ .
+ HCOMPRESSed images are allowed to deviate from the original by about
+ 1/quantize_level of the RMS in each tile. This patch changes the absolute
+ identity test
+Bug: https://github.com/astropy/astropy/issues/4646
+Bug: https://github.com/astropy/astropy/issues/4647
+Bug-Debian: https://bugs.debian.org/816595
+--- a/pyfits/tests/test_image.py
++++ b/pyfits/tests/test_image.py
+@@ -2,6 +2,7 @@
+ 
+ import math
+ import os
++import re
+ import time
+ import warnings
+ 
+@@ -1014,7 +1015,7 @@
+         hdu.writeto(self.temp('test.fits'))
+ 
+         with fits.open(self.temp('test.fits')) as hdul:
+-            assert (hdul['SCI'].data == cube).all()
++            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
+ 
+     def test_subtractive_dither_seed(self):
+         """
+@@ -1269,8 +1270,8 @@
+ 
+         with fits.open(self.temp('test.fits'),
+                        disable_image_compression=True) as h:
+-            assert h[1].header['TFORM1'] == '1PB(30)'
+-            assert h[1].header['TFORM2'] == '1PB(359)'
++            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
++            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
+ 
+     def test_compression_update_header(self):
+         """Regression test for
+
diff --git a/debian/patches/series b/debian/patches/series
index b4aba8c..7ff0b0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-system-cfitsio.diff
 02-numpy-deprecation-warning.diff
+03-fix-for-cfitsio-3380.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyfits.git