[Debian-astro-commits] [python-astropy] 01/04: Fix for wcslib 5.13

[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 62e86a548d8bb6360e1965f7491b80349c2848ed
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Feb 14 15:01:00 2016 +0100

    Fix for wcslib 5.13
---
 debian/changelog                        |  1 +
 debian/patches/fix_for_wcslib5.13.patch | 41 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index caf5284..e5427eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-astropy (1.1.1-3) UNRELEASED; urgency=medium
 
   * Fix for newer pytest. Closes: #812648
+  * Fix for wcslib 5.13
 
  -- Ole Streicher <olebole at debian.org>  Sun, 14 Feb 2016 13:24:29 +0100
 
diff --git a/debian/patches/fix_for_wcslib5.13.patch b/debian/patches/fix_for_wcslib5.13.patch
new file mode 100644
index 0000000..08c6026
--- /dev/null
+++ b/debian/patches/fix_for_wcslib5.13.patch
@@ -0,0 +1,41 @@
+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/series b/debian/patches/series
index ab1402e..0bf5b2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ 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