[Debian-astro-commits] [python-astropy] 02/05: 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 8abb12171ea40513e62b4667cdaa9e56881ccad1
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Dec 19 10:26:45 2017 +0100

    Rediff patches
    
    Drop Shorten-message-to-compare-for-recent-h5py.patch: <REASON>
---
 ...horten-message-to-compare-for-recent-h5py.patch | 22 ----------------------
 debian/patches/disable_helper.patch                |  4 ++--
 debian/patches/mark_known_failures.patch           |  8 ++++----
 debian/patches/only_python3-binaries.patch         |  2 +-
 debian/patches/series                              |  1 -
 5 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/patches/Shorten-message-to-compare-for-recent-h5py.patch b/debian/patches/Shorten-message-to-compare-for-recent-h5py.patch
deleted file mode 100644
index f741b00..0000000
--- a/debian/patches/Shorten-message-to-compare-for-recent-h5py.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Mon, 11 Sep 2017 15:36:05 +0200
-Subject: Shorten message to compare for recent h5py.
-
-See https://github.com/astropy/astropy/issues/6534
----
- astropy/io/misc/tests/test_hdf5.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/astropy/io/misc/tests/test_hdf5.py b/astropy/io/misc/tests/test_hdf5.py
-index 1b8c663..bbc4b2a 100644
---- a/astropy/io/misc/tests/test_hdf5.py
-+++ b/astropy/io/misc/tests/test_hdf5.py
-@@ -413,7 +413,7 @@ def test_metadata_too_large(tmpdir):
-     assert len(w) == 1
-     assert str(w[0].message).startswith(
-         "Attributes could not be written to the output HDF5 "
--        "file: Unable to create attribute (Object header message is too large)")
-+        "file: Unable to create attribute ")
- 
- 
- @pytest.mark.skipif('not HAS_H5PY')
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index 000991d..a99a40b 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -7,10 +7,10 @@ Subject: Disable astropy-helpers copy
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index 8d36c71..89a6a9b 100644
+index 97cb44d..abd94da 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -24,7 +24,7 @@ addopts = --pyargs -p no:warnings
+@@ -25,7 +25,7 @@ addopts = --pyargs -p no:warnings
  bitmap = static/wininst_background.bmp
  
  [ah_bootstrap]
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index bc21ac2..c67ebdc 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -9,10 +9,10 @@ Subject: Mark all known test failures as xfail. These failures have been
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/astropy/io/ascii/tests/test_c_reader.py b/astropy/io/ascii/tests/test_c_reader.py
-index 7bc8618..ceb2ddd 100644
+index 83144e0..e49ef2e 100644
 --- a/astropy/io/ascii/tests/test_c_reader.py
 +++ b/astropy/io/ascii/tests/test_c_reader.py
-@@ -1057,7 +1057,9 @@ def test_int_out_of_range(parallel):
+@@ -1055,7 +1055,9 @@ def test_int_out_of_range(parallel):
      assert_table_equal(table, expected)
  
  
@@ -23,7 +23,7 @@ index 7bc8618..ceb2ddd 100644
  def test_fortran_reader(parallel):
      """
      Make sure that ascii.read() can read Fortran-style exponential notation
-@@ -1101,7 +1103,9 @@ def test_fortran_reader(parallel):
+@@ -1099,7 +1101,9 @@ def test_fortran_reader(parallel):
      assert_table_equal(table, expected)
  
  
@@ -35,7 +35,7 @@ index 7bc8618..ceb2ddd 100644
      """
      Test Fortran-style exponential notation in the fast_reader with invalid
 diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
-index 18524b6..fff462d 100644
+index f1b1fdd..933277a 100644
 --- a/astropy/tests/tests/test_socketblocker.py
 +++ b/astropy/tests/tests/test_socketblocker.py
 @@ -69,6 +69,8 @@ def _square(x):
diff --git a/debian/patches/only_python3-binaries.patch b/debian/patches/only_python3-binaries.patch
index b58eba1..82d2d27 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 1340b7f..ed6f40f 100755
+index b907611..5c4fc6e 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -47,7 +47,8 @@ package_info['package_data'].setdefault('astropy', []).append('data/*')
diff --git a/debian/patches/series b/debian/patches/series
index feb8dcd..69494b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ disable_helper.patch
 only_python3-binaries.patch
 mark_known_failures.patch
 external_python_pkgs.patch
-Shorten-message-to-compare-for-recent-h5py.patch

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