[Debian-astro-commits] [python-astropy] 03/05: Adjust patches for new version

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository python-astropy.

commit 9303a0bcf427ab6ee52ebb0db4ddb453eb59ee9b
Author: Ole Streicher <ole at aip.de>
Date:   Fri Mar 11 10:41:03 2016 +0100

    Adjust patches for new version
---
 debian/patches/fix_astropy_wcs_py.patch  | 15 ------------
 debian/patches/fix_for_wcslib5.13.patch  | 41 --------------------------------
 debian/patches/mark_known_failures.patch |  4 ++--
 debian/patches/series                    |  2 --
 4 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/debian/patches/fix_astropy_wcs_py.patch b/debian/patches/fix_astropy_wcs_py.patch
deleted file mode 100644
index efb1273..0000000
--- a/debian/patches/fix_astropy_wcs_py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Kacper Kowalik <xarthisius.kk at gmail.com>
-Description: Copy keys to a list, since orignal map is modified
-Url: https://github.com/astropy/astropy/issues/4477
-Bug:  https://github.com/astropy/astropy/issues/4460
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -988,7 +988,7 @@
-         """
-         # Never pass SIP coefficients to wcslib
-         # CTYPE must be passed with -SIP to wcslib
--        for key in (m.group() for m in map(SIP_KW.match, header.keys())
-+        for key in (m.group() for m in map(SIP_KW.match, list(header))
-                     if m is not None):
-             del header[key]
- 
diff --git a/debian/patches/fix_for_wcslib5.13.patch b/debian/patches/fix_for_wcslib5.13.patch
deleted file mode 100644
index 08c6026..0000000
--- a/debian/patches/fix_for_wcslib5.13.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 73713a557f71ad61e5785128947db30bab6e0252 Mon Sep 17 00:00:00 2001
-From: Nadia Dencheva <nadia.dencheva at gmail.com>
-Date: Wed, 3 Feb 2016 17:24:01 -0500
-Url: https://patch-diff.githubusercontent.com/raw/astropy/astropy/pull/4564
-Subject: [PATCH] fix validate test to work with wcslib v >=5.13
---- /dev/null
-+++ b/astropy/wcs/tests/data/validate.5.13.txt
-@@ -0,0 +1,16 @@
-+HDU 1:
-+  WCS key ' ':
-+    - RADECSYS= 'ICRS ' / Astrometric system
-+      the RADECSYS keyword is deprecated, use RADESYSa.
-+    - The WCS transformation has more axes (2) than the image it is
-+      associated with (0)
-+    - Removed redundant SCAMP distortion parameters because SIP
-+      parameters are also present
-+
-+HDU 2:
-+  WCS key ' ':
-+    - The WCS transformation has more axes (3) than the image it is
-+      associated with (0)
-+    - 'celfix' made the change 'In CUNIT3 : Mismatched units type
-+      'length': have 'Hz', want 'm''.
-+    - 'unitfix' made the change 'Changed units: 'HZ' -> 'Hz''.
---- a/astropy/wcs/tests/test_wcs.py
-+++ b/astropy/wcs/tests/test_wcs.py
-@@ -424,8 +424,12 @@
-     with catch_warnings():
-         results = wcs.validate(get_pkg_data_filename("data/validate.fits"))
-         results_txt = repr(results)
--        if wcs._wcs.__version__[0] == '5':
--            filename = 'data/validate.5.0.txt'
-+        version = wcs._wcs.__version__
-+        if version[0] == '5':
-+            if version >= '5.13':
-+                filename = 'data/validate.5.13.txt'
-+            else:
-+                filename = 'data/validate.5.0.txt'
-         else:
-             filename = 'data/validate.txt'
-         with open(get_pkg_data_filename(filename), "r") as fd:
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index dbda27b..8e276b3 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -12,7 +12,7 @@ Description: Mark all known test failures as xfail.
      def test_read_from_fileobj(self, tmpdir):
          filename = str(tmpdir.join('test_read_from_fileobj.fits'))
          hdu = BinTableHDU(self.data)
-@@ -172,6 +174,8 @@
+@@ -175,6 +177,8 @@
      def setup_method(self, method):
          warnings.filterwarnings('always')
  
@@ -21,7 +21,7 @@ Description: Mark all known test failures as xfail.
      def test_read(self, tmpdir):
          filename = str(tmpdir.join('test_read.fits'))
          self.hdus.writeto(filename)
-@@ -189,6 +193,8 @@
+@@ -192,6 +196,8 @@
              Table.read(filename, hdu=0)
          assert exc.value.args[0] == 'No table found in hdu=0'
  
diff --git a/debian/patches/series b/debian/patches/series
index 0bf5b2f..04aaa11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 mark_known_failures.patch
 disable_helper.patch
-fix_astropy_wcs_py.patch
 fix_for_pytest_2.8.patch
-fix_for_wcslib5.13.patch

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