[Debian-astro-commits] [python-astropy] 03/04: Adjust patches for RC version

Sun Jun 12 08:51:22 UTC 2016

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

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

commit 6018edfa4562b469a005fdb8f422644d8ccfe7a0
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Jun 12 10:31:56 2016 +0200

    Adjust patches for RC version
---
 debian/changelog                          |  5 +++--
 debian/patches/disable_helper.patch       |  2 +-
 debian/patches/fix_for_cfitsio_3380.patch | 21 +--------------------
 debian/patches/mark_known_failures.patch  | 16 ++++++++--------
 debian/patches/series                     |  1 -
 5 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f13da73..7dc8a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-python-astropy (1.1.2-2) UNRELEASED; urgency=low
+python-astropy (1.2~rc1-1) UNRELEASED; urgency=low
 
   * Install Python 3 versions of the scripts
   * Push Standards-Version to 3.9.8. No changes needed
+  * New upstream RC
 
- -- Ole Streicher <olebole at debian.org>  Mon, 09 May 2016 23:13:29 -0300
+ -- Ole Streicher <olebole at debian.org>  Sun, 12 Jun 2016 10:27:32 +0200
 
 python-astropy (1.1.2-1) unstable; urgency=low
 
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index a226408..64073c9 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
-@@ -23,7 +23,7 @@
+@@ -18,7 +18,7 @@
  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 d4a8fa0..9a688d9 100644
--- a/debian/patches/fix_for_cfitsio_3380.patch
+++ b/debian/patches/fix_for_cfitsio_3380.patch
@@ -5,15 +5,7 @@ Description: Make TFORMx check more flexible
 Bug: https://github.com/astropy/astropy/issues/4646
 --- a/astropy/io/fits/tests/test_image.py
 +++ b/astropy/io/fits/tests/test_image.py
-@@ -4,6 +4,7 @@
- 
- import math
- import os
-+import re
- import time
- import warnings
- 
-@@ -1010,7 +1011,7 @@
+@@ -1070,7 +1070,7 @@
          hdu.writeto(self.temp('test.fits'))
  
          with fits.open(self.temp('test.fits')) as hdul:
@@ -22,14 +14,3 @@ Bug: https://github.com/astropy/astropy/issues/4646
  
      def test_subtractive_dither_seed(self):
          """
-@@ -1265,8 +1266,8 @@
- 
-         with fits.open(self.temp('test.fits'),
-                        disable_image_compression=True) as h:
--            assert h[1].header['TFORM1'] == '1PB(30)'
--            assert h[1].header['TFORM2'] == '1PB(359)'
-+            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
-+            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
- 
-     def test_compression_update_header(self):
-         """Regression test for
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 8e276b3..6cb7ba2 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -3,7 +3,7 @@ Description: Mark all known test failures as xfail.
  These failures have been discussed with upstream.
 --- a/astropy/io/fits/tests/test_connect.py
 +++ b/astropy/io/fits/tests/test_connect.py
-@@ -136,6 +136,8 @@
+@@ -134,6 +134,8 @@
          # while reading is to check whether col.null is present. For float columns, col.null
          # is not initialized
  
@@ -12,7 +12,7 @@ Description: Mark all known test failures as xfail.
      def test_read_from_fileobj(self, tmpdir):
          filename = str(tmpdir.join('test_read_from_fileobj.fits'))
          hdu = BinTableHDU(self.data)
-@@ -175,6 +177,8 @@
+@@ -173,6 +175,8 @@
      def setup_method(self, method):
          warnings.filterwarnings('always')
  
@@ -21,7 +21,7 @@ Description: Mark all known test failures as xfail.
      def test_read(self, tmpdir):
          filename = str(tmpdir.join('test_read.fits'))
          self.hdus.writeto(filename)
-@@ -192,6 +196,8 @@
+@@ -190,6 +194,8 @@
              Table.read(filename, hdu=0)
          assert exc.value.args[0] == 'No table found in hdu=0'
  
@@ -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
-@@ -84,6 +84,8 @@
+@@ -85,6 +85,8 @@
  if six.PY3 or platform.system() == 'Windows':
      __doctest_skip__ = ['WCS.all_world2pix']
  
@@ -79,15 +79,15 @@ Description: Mark all known test failures as xfail.
      rng = np.random.RandomState(rseed)
 --- a/astropy/table/tests/test_info.py
 +++ b/astropy/table/tests/test_info.py
-@@ -6,6 +6,7 @@
- import warnings
+@@ -8,6 +8,7 @@
+ 
  import numpy as np
  
 +from ...tests.helper import pytest
  from ...extern import six
  from ... import units as u
  from ... import time
-@@ -225,7 +226,8 @@
+@@ -226,7 +227,8 @@
          t.info(out=out)
          assert out.getvalue().splitlines() == exp
  
@@ -99,7 +99,7 @@ Description: Mark all known test failures as xfail.
      with warnings.catch_warnings(record=True) as warns:
 --- a/astropy/coordinates/tests/test_angles.py
 +++ b/astropy/coordinates/tests/test_angles.py
-@@ -611,6 +611,8 @@
+@@ -610,6 +610,8 @@
      lat[0] = Angle(lon)
      assert lat.value[0] == 10.0
  
diff --git a/debian/patches/series b/debian/patches/series
index 7e8fe32..7b0f25c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 mark_known_failures.patch
 disable_helper.patch
-fix_for_pytest_2.8.patch
 fix_for_cfitsio_3380.patch
 only_python3-binaries.patch

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

