[Debian-astro-commits] [python-astropy] 02/07: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Tue Dec 13 10:12:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository python-astropy.
commit d891df5d93292b7d65ab7f31dbfb84da9eb90571
Author: Ole Streicher <olebole at debian.org>
Date: Tue Dec 13 09:43:06 2016 +0100
Rediff patches
---
debian/patches/disable_helper.patch | 15 ++++--
debian/patches/fix_for_cfitsio_3380.patch | 19 +++++---
debian/patches/mark_known_failures.patch | 74 ++++++++++++++++++------------
debian/patches/only_python3-binaries.patch | 14 ++++--
4 files changed, 79 insertions(+), 43 deletions(-)
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index 64073c9..16acc22 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -1,9 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Disable astropy-helpers copy
-Bug: https://bugs.debian.org/761055
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 13 Dec 2016 09:41:39 +0100
+Subject: Disable astropy-helpers copy
+
+---
+ setup.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index cc67de4..206e6f8 100644
--- a/setup.cfg
+++ b/setup.cfg
-@@ -18,7 +18,7 @@
+@@ -23,7 +23,7 @@ open_files_ignore = "astropy.log" "/etc/hosts"
bitmap = static/wininst_background.bmp
[ah_bootstrap]
diff --git a/debian/patches/fix_for_cfitsio_3380.patch b/debian/patches/fix_for_cfitsio_3380.patch
index 9a688d9..a445d10 100644
--- a/debian/patches/fix_for_cfitsio_3380.patch
+++ b/debian/patches/fix_for_cfitsio_3380.patch
@@ -1,11 +1,18 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Make TFORMx check more flexible
- The maximal column length in cfitsio changed between version 3370 and 3380.
- This patch checks their syntax, without a specific length.
-Bug: https://github.com/astropy/astropy/issues/4646
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 13 Dec 2016 09:41:39 +0100
+Subject: Make TFORMx check more flexible The maximal column length in cfitsio
+ changed between version 3370 and 3380. This patch checks their syntax,
+ without a specific length.
+
+---
+ astropy/io/fits/tests/test_image.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/astropy/io/fits/tests/test_image.py b/astropy/io/fits/tests/test_image.py
+index a8551dd..17af9a0 100644
--- a/astropy/io/fits/tests/test_image.py
+++ b/astropy/io/fits/tests/test_image.py
-@@ -1070,7 +1070,7 @@
+@@ -1107,7 +1107,7 @@ class TestCompressedImage(FitsTestCase):
hdu.writeto(self.temp('test.fits'))
with fits.open(self.temp('test.fits')) as hdul:
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 2d5bb0d..48c724b 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -1,41 +1,27 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Mark all known test failures as xfail.
- These failures have been discussed with upstream.
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -85,6 +85,8 @@
- if six.PY3 or platform.system() == 'Windows':
- __doctest_skip__ = ['WCS.all_world2pix']
-
-+# see https://github.com/astropy/astropy/issues/3380
-+__doctest_skip__ = ['WCS.all_world2pix']
-
- if _wcs is not None:
- WCSBase = _wcs._Wcs
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@
- def _square(x):
- return x ** 2
-
--
-- at pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
-+# see https://github.com/astropy/astropy/issues/4193
-+ at pytest.mark.skipif(True, reason="Blocks on Debian CI test")
- def test_multiprocessing_forkserver():
- """
- Test that using multiprocessing with forkserver works. Perhaps
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 13 Dec 2016 09:41:39 +0100
+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/wcs/wcs.py | 2 ++
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py
+index 2bbcc7a..50fbdb4 100644
--- a/astropy/table/tests/test_info.py
+++ b/astropy/table/tests/test_info.py
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ from collections import OrderedDict
import numpy as np
+from ...tests.helper import pytest
from ...extern import six
+ from ...extern.six.moves import cStringIO as StringIO
from ... import units as u
- from ... import time
-@@ -226,7 +227,8 @@
+@@ -229,7 +230,8 @@ def test_class_attribute():
t.info(out=out)
assert out.getvalue().splitlines() == exp
@@ -45,3 +31,31 @@ Description: Mark all known test failures as xfail.
def test_ignore_warnings():
t = table.Table([[np.nan, np.nan]])
with warnings.catch_warnings(record=True) as warns:
+diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
+index c362fa5..783defe 100644
+--- a/astropy/tests/tests/test_socketblocker.py
++++ b/astropy/tests/tests/test_socketblocker.py
+@@ -66,8 +66,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4)
+ def _square(x):
+ return x ** 2
+
+-
+- at pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
++# see https://github.com/astropy/astropy/issues/4193
++ at pytest.mark.skipif(True, reason="Blocks on Debian CI test")
+ def test_multiprocessing_forkserver():
+ """
+ Test that using multiprocessing with forkserver works. Perhaps
+diff --git a/astropy/wcs/wcs.py b/astropy/wcs/wcs.py
+index 614320a..5353929 100644
+--- a/astropy/wcs/wcs.py
++++ b/astropy/wcs/wcs.py
+@@ -88,6 +88,8 @@ __all__ = ['FITSFixedWarning', 'WCS', 'find_all_wcs',
+ if not six.PY2 or platform.system() == 'Windows':
+ __doctest_skip__ = ['WCS.all_world2pix']
+
++# see https://github.com/astropy/astropy/issues/3380
++__doctest_skip__ = ['WCS.all_world2pix']
+
+ if _wcs is not None:
+ WCSBase = _wcs._Wcs
diff --git a/debian/patches/only_python3-binaries.patch b/debian/patches/only_python3-binaries.patch
index cbdc0fe..35e9751 100644
--- a/debian/patches/only_python3-binaries.patch
+++ b/debian/patches/only_python3-binaries.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Install the scripts only for the Python 3 version
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 13 Dec 2016 09:41:39 +0100
+Subject: Install the scripts only for the Python 3 version
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e0bb07a..48f3124 100755
--- a/setup.py
+++ b/setup.py
-@@ -53,7 +53,8 @@
+@@ -53,7 +53,8 @@ package_info['package_data'].setdefault('astropy', []).append('data/*')
# Add any necessary entry points
entry_points = {}
# Command-line scripts
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git
More information about the Debian-astro-commits
mailing list