[Python-modules-commits] [pyfits] 07/10: merge patched into master

[Aurelien Jarno]

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

aurel32 pushed a commit to branch master
in repository pyfits.

commit f0abda469015c5000a88df2ff01ac1538c96550e
Merge: a55be26 90cac05
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Tue Feb 2 22:44:05 2016 +0100

    merge patched into master

 debian/.git-dpm                                  |  4 ++--
 debian/patches/02-numpy-deprecation-warning.diff | 24 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 pyfits/tests/test_division.py                    |  3 ++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 0b6d423,0000000..50ad9fc
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
- 70fe4dac3f68c3eed369d42e6a49e7865db8b250
- 70fe4dac3f68c3eed369d42e6a49e7865db8b250
++90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b
++90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b
 +fc71929135ce8db757eac89a965beb176b28c08b
 +fc71929135ce8db757eac89a965beb176b28c08b
 +pyfits_3.4.orig.tar.gz
 +3fa0e0c51f2a2a30384aea0de226cf5da05fce57
 +1692414
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/02-numpy-deprecation-warning.diff
index 0000000,0000000..026e6b8
new file mode 100644
--- /dev/null
+++ b/debian/patches/02-numpy-deprecation-warning.diff
@@@ -1,0 -1,0 +1,24 @@@
++From 90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b Mon Sep 17 00:00:00 2001
++From: Aurelien Jarno <aurelien at aurel32.net>
++Date: Tue, 2 Feb 2016 22:41:09 +0100
++Subject: Avoid DeprecationWarning from Numpy.
++
++Patch-Name: 02-numpy-deprecation-warning.diff
++---
++ pyfits/tests/test_division.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/pyfits/tests/test_division.py b/pyfits/tests/test_division.py
++index da4df72..aa93264 100644
++--- a/pyfits/tests/test_division.py
+++++ b/pyfits/tests/test_division.py
++@@ -18,7 +18,8 @@ class TestDivisionFunctions(PyfitsTestCase):
++         a1 = np.rec.array(
++             s,
++             dtype=np.dtype([('c1', '>i4'), ('c2', '|S3'),
++-                         ('c3', '>f4'), ('c4', '|i1')]))
+++                         ('c3', '>f4'), ('c4', '|i1')]),
+++            shape=len(s) // 12)
++ 
++     def test_card_with_continue(self):
++         h = fits.PrimaryHDU()
diff --cc debian/patches/series
index 0d1ca88,0000000..b4aba8c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +01-system-cfitsio.diff
++02-numpy-deprecation-warning.diff

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