[Debian-astro-commits] [python-astropy] 03/05: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Sun Jul 2 12:54:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository python-astropy.
commit fbcd0226e47384b504981b6c9ae1bd39280ef5bc
Author: Ole Streicher <olebole at debian.org>
Date: Wed Jun 28 08:37:44 2017 +0200
Rediff patches
---
debian/patches/disable_helper.patch | 8 ++---
debian/patches/external_python_pkgs.patch | 28 +++++------------
debian/patches/mark_known_failures.patch | 48 +++++++++++++-----------------
debian/patches/only_python3-binaries.patch | 2 +-
4 files changed, 32 insertions(+), 54 deletions(-)
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index b38d589..97ecd37 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -7,15 +7,15 @@ Subject: Disable astropy-helpers copy
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.cfg b/setup.cfg
-index 342cb20..289764c 100644
+index caaeda1..597c14f 100644
--- a/setup.cfg
+++ b/setup.cfg
-@@ -23,7 +23,7 @@ open_files_ignore = "astropy.log" "/etc/hosts"
+@@ -23,7 +23,7 @@ addopts = -p no:warnings
bitmap = static/wininst_background.bmp
[ah_bootstrap]
-auto_use = True
+auto_use = False
- # We now have sections for the pep8 and flake8 commands. We need to repeat the
- # configuration once for each command. Rather than check all warnings, we only
+ [zest.releaser]
+ prereleaser.middle = astropy.utils.release.prereleaser_middle
diff --git a/debian/patches/external_python_pkgs.patch b/debian/patches/external_python_pkgs.patch
index 4179609..fff0896 100644
--- a/debian/patches/external_python_pkgs.patch
+++ b/debian/patches/external_python_pkgs.patch
@@ -8,11 +8,10 @@ Subject: Use external python modules instead of convenience copies
astropy/extern/six.py | 2 +-
astropy/table/jsviewer.py | 14 ++++++++------
astropy/table/tests/test_jsviewer.py | 6 +++---
- astropy/tests/helper.py | 2 +-
astropy/units/format/cds.py | 4 ++--
astropy/units/format/generic.py | 4 ++--
astropy/units/format/ogip.py | 4 ++--
- 9 files changed, 24 insertions(+), 19 deletions(-)
+ 8 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py
index cfa894e..bb8fb7d 100644
@@ -55,7 +54,7 @@ index 5398fc0..fb3a30c 100644
def _find_module(name, path=None):
diff --git a/astropy/table/jsviewer.py b/astropy/table/jsviewer.py
-index d0cc380..9f686ea 100644
+index 0ec7824..033dd43 100644
--- a/astropy/table/jsviewer.py
+++ b/astropy/table/jsviewer.py
@@ -30,8 +30,8 @@ class Conf(_config.ConfigNamespace):
@@ -99,10 +98,10 @@ index d0cc380..9f686ea 100644
return conf.datatables_url[:-3]
diff --git a/astropy/table/tests/test_jsviewer.py b/astropy/table/tests/test_jsviewer.py
-index 6a8b033..5018bd4 100644
+index 51738e1..f95a99a 100644
--- a/astropy/table/tests/test_jsviewer.py
+++ b/astropy/table/tests/test_jsviewer.py
-@@ -145,9 +145,9 @@ def test_write_jsviewer_local(tmpdir):
+@@ -146,9 +146,9 @@ def test_write_jsviewer_local(tmpdir):
table_id='test',
length='50',
display_length='10, 25, 50, 100, 500, 1000',
@@ -115,19 +114,6 @@ index 6a8b033..5018bd4 100644
)
with open(tmpfile) as f:
assert f.read().strip() == ref.strip()
-diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
-index 9e88d1f..94bd40a 100644
---- a/astropy/tests/helper.py
-+++ b/astropy/tests/helper.py
-@@ -40,7 +40,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
- 'pickle_protocol', 'generic_recursive_equality_test']
-
-
--if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
-+if True:
- import pytest
-
- else:
diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py
index e40c1cf..0d5e033 100644
--- a/astropy/units/format/cds.py
@@ -151,10 +137,10 @@ index e40c1cf..0d5e033 100644
tokens = cls._tokens
diff --git a/astropy/units/format/generic.py b/astropy/units/format/generic.py
-index 6f1d0e6..8c12a2d 100644
+index 974ca25..7d40dfe 100644
--- a/astropy/units/format/generic.py
+++ b/astropy/units/format/generic.py
-@@ -102,7 +102,7 @@ class Generic(Base):
+@@ -103,7 +103,7 @@ class Generic(Base):
@classmethod
def _make_lexer(cls):
@@ -163,7 +149,7 @@ index 6f1d0e6..8c12a2d 100644
tokens = cls._tokens
-@@ -177,7 +177,7 @@ class Generic(Base):
+@@ -178,7 +178,7 @@ class Generic(Base):
formats, the only difference being the set of available unit
strings.
"""
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 1a30bc1..3a2bc20 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -4,25 +4,30 @@ Subject: Mark all known test failures as xfail. These failures have been
discussed with upstream.
---
- astropy/table/tests/test_info.py | 4 +++-
+ astropy/samp/tests/test_standard_profile.py | 2 ++
+ astropy/table/tests/test_info.py | 3 ++-
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(-)
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+diff --git a/astropy/samp/tests/test_standard_profile.py b/astropy/samp/tests/test_standard_profile.py
+index 632db07..7e92aab 100644
+--- a/astropy/samp/tests/test_standard_profile.py
++++ b/astropy/samp/tests/test_standard_profile.py
+@@ -56,6 +56,8 @@ class TestStandardProfile(object):
+
+ self.hub.stop()
+
++ # see https://github.com/astropy/astropy/issues/5460
++ @pytest.mark.skipif(True, reason="Setup fails due to SSL problems")
+ def test_main(self):
+
+ self.client1_id = self.client1.get_public_id()
diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py
-index 2bbcc7a..50fbdb4 100644
+index 0b46014..b14afba 100644
--- a/astropy/table/tests/test_info.py
+++ b/astropy/table/tests/test_info.py
-@@ -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
-@@ -229,7 +230,8 @@ def test_class_attribute():
+@@ -230,7 +230,8 @@ def test_class_attribute():
t.info(out=out)
assert out.getvalue().splitlines() == exp
@@ -33,10 +38,10 @@ index 2bbcc7a..50fbdb4 100644
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
+index 18524b6..bcc5aea 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)
+@@ -67,8 +67,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4)
def _square(x):
return x ** 2
@@ -69,16 +74,3 @@ index 53436dd..4c710e7 100644
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
-+++ b/astropy/vo/samp/tests/test_standard_profile.py
-@@ -62,6 +62,8 @@ class TestStandardProfile(object):
-
- self.hub.stop()
-
-+ # see https://github.com/astropy/astropy/issues/5460
-+ @pytest.mark.skipif(True, reason="Setup fails due to SSL problems")
- def test_main(self):
-
- self.client1_id = self.client1.get_public_id()
diff --git a/debian/patches/only_python3-binaries.patch b/debian/patches/only_python3-binaries.patch
index 647a406..f913ce9 100644
--- a/debian/patches/only_python3-binaries.patch
+++ b/debian/patches/only_python3-binaries.patch
@@ -7,7 +7,7 @@ Subject: Install the scripts only for the Python 3 version
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index 62f4b6e..420ecd1 100755
+index 4834eaf..5adac6d 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,8 @@ package_info['package_data'].setdefault('astropy', []).append('data/*')
--
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