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

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository python-astropy.

commit c65b7959472a2d2706b3e9d510306fe6508ea3a5
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jul 10 10:21:19 2017 +0200

    Rediff patches
---
 debian/patches/disable_helper.patch        |  6 +++---
 debian/patches/mark_known_failures.patch   | 28 +++++++---------------------
 debian/patches/only_python3-binaries.patch |  2 +-
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index 97ecd37..bca5d9d 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -7,7 +7,7 @@ Subject: Disable astropy-helpers copy
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index caaeda1..597c14f 100644
+index 3782ab9..a1b683a 100644
 --- a/setup.cfg
 +++ b/setup.cfg
 @@ -23,7 +23,7 @@ addopts = -p no:warnings
@@ -17,5 +17,5 @@ index caaeda1..597c14f 100644
 -auto_use = True
 +auto_use = False
  
- [zest.releaser]
- prereleaser.middle = astropy.utils.release.prereleaser_middle
+ [flake8]
+ exclude = extern,*parsetab.py,*lextab.py
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 3fea299..47ae078 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -6,13 +6,12 @@ Subject: Mark all known test failures as xfail. These failures have been
 ---
  astropy/samp/tests/test_standard_profile.py                           | 2 ++
  astropy/table/tests/test_info.py                                      | 3 ++-
- astropy/table/tests/test_operations.py                                | 2 ++
- astropy/tests/tests/test_socketblocker.py                             | 4 ++--
+ astropy/tests/tests/test_socketblocker.py                             | 3 ++-
  astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++
- 5 files changed, 12 insertions(+), 3 deletions(-)
+ 4 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/astropy/samp/tests/test_standard_profile.py b/astropy/samp/tests/test_standard_profile.py
-index 632db07..7e92aab 100644
+index 632db07..a654933 100644
 --- a/astropy/samp/tests/test_standard_profile.py
 +++ b/astropy/samp/tests/test_standard_profile.py
 @@ -56,6 +56,8 @@ class TestStandardProfile(object):
@@ -25,10 +24,10 @@ index 632db07..7e92aab 100644
  
          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 0b46014..b14afba 100644
+index 793418c..3c8882d 100644
 --- a/astropy/table/tests/test_info.py
 +++ b/astropy/table/tests/test_info.py
-@@ -230,7 +230,8 @@ def test_class_attribute():
+@@ -229,7 +229,8 @@ def test_class_attribute():
          t.info(out=out)
          assert out.getvalue().splitlines() == exp
  
@@ -38,21 +37,8 @@ index 0b46014..b14afba 100644
  def test_ignore_warnings():
      t = table.Table([[np.nan, np.nan]])
      with warnings.catch_warnings(record=True) as warns:
-diff --git a/astropy/table/tests/test_operations.py b/astropy/table/tests/test_operations.py
-index 0086dc4..65c5247 100644
---- a/astropy/table/tests/test_operations.py
-+++ b/astropy/table/tests/test_operations.py
-@@ -629,6 +629,8 @@ class TestVStack():
-                                                     '0.0 foo',
-                                                     '1.0  --']
- 
-+    # see https://github.com/astropy/astropy/issues/6291
-+    @pytest.mark.xfail()
-     def test_col_meta_merge_inner(self, operation_table_type):
-         self._setup(operation_table_type)
-         t1 = self.t1
 diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
-index 18524b6..bcc5aea 100644
+index 18524b6..e5c1a90 100644
 --- a/astropy/tests/tests/test_socketblocker.py
 +++ b/astropy/tests/tests/test_socketblocker.py
 @@ -67,8 +67,9 @@ PY3_4 = sys.version_info[:2] >= (3, 4)
@@ -67,7 +53,7 @@ index 18524b6..bcc5aea 100644
      """
      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
+index 53436dd..b97cb1f 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
diff --git a/debian/patches/only_python3-binaries.patch b/debian/patches/only_python3-binaries.patch
index f913ce9..a5885bf 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 4834eaf..5adac6d 100755
+index 52adfeb..aaab657 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