[Debian-astro-commits] [python-astropy] 01/01: 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 experimental
in repository python-astropy.

commit 6ab468a3de5b7448b96a4b7f61b9d96d5f11a28d
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Oct 17 13:44:16 2015 +0200

    Adjust patches for new version
---
 debian/patches/4227.patch                | 30 ------------------------------
 debian/patches/disable_helper.patch      |  2 +-
 debian/patches/mark_known_failures.patch |  2 +-
 debian/patches/series                    |  1 -
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/patches/4227.patch b/debian/patches/4227.patch
deleted file mode 100644
index 4331b9d..0000000
--- a/debian/patches/4227.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8476d178c6daebbd2e62156f323e8f53e769ee85 Mon Sep 17 00:00:00 2001
-From: Marten van Kerkwijk <mhvk at astro.utoronto.ca>
-Date: Wed, 7 Oct 2015 09:34:29 -0400
-Subject: [PATCH] Use integer X,Y,Z in test to avoid rounding errors on i386.
- Closes #4226.
-
----
- astropy/coordinates/tests/test_sky_coord.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/astropy/coordinates/tests/test_sky_coord.py b/astropy/coordinates/tests/test_sky_coord.py
-index 7b22ff6..3dadc00 100644
---- a/astropy/coordinates/tests/test_sky_coord.py
-+++ b/astropy/coordinates/tests/test_sky_coord.py
-@@ -503,12 +503,12 @@ def test_repr():
- @pytest.mark.skipif('NUMPY_LT_1_7')
- def test_repr_altaz():
-     sc2 = SkyCoord(1 * u.deg, 1 * u.deg, frame='icrs', distance=1 * u.kpc)
--    loc = EarthLocation.from_geodetic(-122*u.deg, -47*u.deg)
-+    loc = EarthLocation(-2309223 * u.m, -3695529 * u.m, -4641767 * u.m)
-     time = Time('2005-03-21 00:00:00')
-     sc4 = sc2.transform_to(AltAz(location=loc, obstime=time))
-     assert repr(sc4).startswith("<SkyCoord (AltAz: obstime=2005-03-21 00:00:00.000, "
--                         "location=(-2309222.664660742, -3695528.7655007695, "
--                         "-4641764.788820372) m, pressure=0.0 hPa, "
-+                         "location=(-2309223.0, -3695529.0, "
-+                                "-4641767.0) m, pressure=0.0 hPa, "
-                          "temperature=0.0 deg_C, relative_humidity=0, "
-                          "obswl=1.0 micron): (az, alt, distance) in "
-                          "(deg, deg, m)\n")
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index 2e751c9..a226408 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -3,7 +3,7 @@ Description: Disable astropy-helpers copy
 Bug: https://bugs.debian.org/761055
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  bitmap = static/wininst_background.bmp
  
  [ah_bootstrap]
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index b9f417b..4322734 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -32,7 +32,7 @@ Description: Mark all known test failures as xfail.
          filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
 --- a/astropy/wcs/wcs.py
 +++ b/astropy/wcs/wcs.py
-@@ -74,6 +74,8 @@
+@@ -83,6 +83,8 @@
  if six.PY3 or platform.system() == 'Windows':
      __doctest_skip__ = ['WCS.all_world2pix']
  
diff --git a/debian/patches/series b/debian/patches/series
index 6dee456..82acab5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 mark_known_failures.patch
 disable_helper.patch
-4227.patch

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