[python-astropy] 03/05: Adjust 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 84c10760c74a601cec9de6f360e8a603224dbb16
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jan 16 09:13:46 2015 +0100

    Adjust patches
---
 debian/changelog                         |  6 +++++
 debian/patches/mark_known_failures.patch | 45 --------------------------------
 debian/patches/use_wcslib_4.24.patch     |  6 -----
 3 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e20e14..d57b280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (0.4.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Ole Streicher <olebole at debian.org>  Fri, 16 Jan 2015 09:08:39 +0100
+
 python-astropy (0.4.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 3aa666b..130cdd7 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -1,51 +1,6 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Mark all known test failures as xfail.
  These failures have been discussed with upstream.
---- a/astropy/io/fits/tests/test_connect.py
-+++ b/astropy/io/fits/tests/test_connect.py
-@@ -121,6 +121,9 @@
-         # while reading is to check whether col.null is present. For float columns, col.null
-         # is not initialized
- 
-+    # see https://github.com/astropy/astropy/issues/1849
-+    # Fails on powerpc, s390
-+    @pytest.mark.xfail
-     def test_read_from_fileobj(self, tmpdir):
-         filename = str(tmpdir.join('test_read_from_fileobj.fits'))
-         hdu = BinTableHDU(self.data)
-@@ -157,6 +160,9 @@
-     def setup_method(self, method):
-         warnings.filterwarnings('always')
- 
-+    # see https://github.com/astropy/astropy/issues/1849
-+    # Fails on powerpc, s390
-+    @pytest.mark.xfail
-     def test_read(self, tmpdir):
-         filename = str(tmpdir.join('test_read.fits'))
-         self.hdus.writeto(filename)
-@@ -175,6 +181,9 @@
-         assert exc.value.args[0] == 'No table found in hdu=0'
- 
-     @pytest.mark.parametrize('hdu', [1, 'first'])
-+    # see https://github.com/astropy/astropy/issues/1849
-+    # Fails on powerpc, s390
-+    @pytest.mark.xfail
-     def test_read_with_hdu_1(self, tmpdir, hdu):
-         filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
-         self.hdus.writeto(filename)
---- a/astropy/modeling/tests/test_rotations.py
-+++ b/astropy/modeling/tests/test_rotations.py
-@@ -46,7 +46,9 @@
-     x, y = model(1, 0)
-     utils.assert_allclose([x, y], [0, 1], atol=1e-10)
- 
--
-+# see https://github.com/astropy/astropy/issues/2708
-+# Fails on powerpc, s390
-+ at pytest.mark.xfail
- def test_Rotation2D_inverse():
-     model = models.Rotation2D(angle=234.23494)
-     inverse = model.inverse()
 --- a/astropy/config/tests/test_configs.py
 +++ b/astropy/config/tests/test_configs.py
 @@ -331,4 +331,5 @@
diff --git a/debian/patches/use_wcslib_4.24.patch b/debian/patches/use_wcslib_4.24.patch
index cf90bbd..1705435 100644
--- a/debian/patches/use_wcslib_4.24.patch
+++ b/debian/patches/use_wcslib_4.24.patch
@@ -3,12 +3,6 @@ Description: Use wcslib version 4.24 which is API incompatible to 4.23.
  4.23 is still the version in astropy.
 --- a/astropy/wcs/include/wcslib/wcs.h
 +++ b/astropy/wcs/include/wcslib/wcs.h
-@@ -1,4 +1,4 @@
--/*============================================================================
-+/*============================================================================
- 
-   WCSLIB 4.23 - an implementation of the FITS WCS standard.
-   Copyright (C) 1995-2014, Mark Calabretta
 @@ -1568,7 +1568,7 @@
  int wcssub(int alloc, const struct wcsprm *wcssrc, int *nsub, int axes[],
             struct wcsprm *wcsdst);

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