[Debian-astro-commits] [python-astropy] 01/02: Rediff patches

[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 624a51fccd6bede4c2e15d560be054fd695691b7
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Dec 23 17:58:14 2016 +0100

    Rediff patches
---
 debian/patches/mark_known_failures.patch | 31 +++++++++++++++++++++++++++----
 debian/patches/series                    |  2 +-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 91a6386..1a30bc1 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -4,10 +4,11 @@ Subject: Mark all known test failures as xfail. These failures have been
  discussed with upstream.
 
 ---
- astropy/table/tests/test_info.py               | 4 +++-
- astropy/tests/tests/test_socketblocker.py      | 4 ++--
- astropy/vo/samp/tests/test_standard_profile.py | 2 ++
- 3 files changed, 7 insertions(+), 3 deletions(-)
+ astropy/table/tests/test_info.py                                      | 4 +++-
+ astropy/tests/tests/test_socketblocker.py                             | 4 ++--
+ astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++
+ astropy/vo/samp/tests/test_standard_profile.py                        | 2 ++
+ 4 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py
 index 2bbcc7a..50fbdb4 100644
@@ -46,6 +47,28 @@ index c362fa5..783defe 100644
  def test_multiprocessing_forkserver():
      """
      Test that using multiprocessing with forkserver works.  Perhaps
+diff --git a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
+index 53436dd..4c710e7 100644
+--- a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
++++ b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
+@@ -3,6 +3,8 @@ from ..core import WCSAxes
+ import matplotlib.pyplot as plt
+ from matplotlib.backend_bases import KeyEvent
+ 
++import pytest
++
+ from ....wcs import WCS
+ from ....extern import six
+ from ....coordinates import FK5
+@@ -93,6 +95,8 @@ class TestDisplayWorldCoordinate(BaseImageTests):
+ 
+         assert string_world5 == six.u('267.652 -28\xb046\'23" (world, overlay 3)')
+ 
++    # See https://github.com/astropy/astropy/issues/5601
++    @pytest.mark.xfail()
+     def test_cube_coords(self, tmpdir):
+         wcs = WCS(self.cube_header)
+ 
 diff --git a/astropy/vo/samp/tests/test_standard_profile.py b/astropy/vo/samp/tests/test_standard_profile.py
 index 325ac96..ac25e55 100644
 --- a/astropy/vo/samp/tests/test_standard_profile.py
diff --git a/debian/patches/series b/debian/patches/series
index 7b0f25c..a06b933 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-mark_known_failures.patch
 disable_helper.patch
 fix_for_cfitsio_3380.patch
 only_python3-binaries.patch
+mark_known_failures.patch

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