[python-astropy] 02/04: Adjust patches for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Mon Jul 7 14:56:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository python-astropy.
commit 559f0f5e5af3beb52910decbeeb56f65df7b5bff
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Jul 7 16:06:57 2014 +0200
Adjust patches for new version
---
debian/changelog | 6 ++++++
debian/patches/fix_checksum_test.patch | 36 --------------------------------
debian/patches/mark_known_failures.patch | 30 ++++++++------------------
debian/patches/series | 1 -
4 files changed, 15 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 736570e..19a3678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (0.4~rc1-1) experimental; urgency=low
+
+ * New upstream prerelease
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 07 Jul 2014 16:07:05 +0200
+
python-astropy (0.3.2-3) unstable; urgency=low
* Fix checksum calculation and test on 32-bit
diff --git a/debian/patches/fix_checksum_test.patch b/debian/patches/fix_checksum_test.patch
deleted file mode 100644
index 15ea092..0000000
--- a/debian/patches/fix_checksum_test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Michael Droettboom <mdboom at gmail.com>
-Description: Fix checksum tests on 32-bit systems
-Url: https://github.com/astropy/astropy/pull/2484
---- a/astropy/io/fits/hdu/base.py
-+++ b/astropy/io/fits/hdu/base.py
-@@ -1581,8 +1581,8 @@
-
- hi = sum32 >> u16
- lo = sum32 & uFFFF
-- hi += np.add.reduce(bytes[0::2])
-- lo += np.add.reduce(bytes[1::2])
-+ hi += np.add.reduce(bytes[0::2], dtype=np.uint64)
-+ lo += np.add.reduce(bytes[1::2], dtype=np.uint64)
-
- if (bytes.nbytes // 2) % 2:
- lo += last << u8
---- a/astropy/io/fits/tests/test_checksum.py
-+++ b/astropy/io/fits/tests/test_checksum.py
-@@ -42,7 +42,7 @@
- hdul.close()
-
- def test_image_create(self):
-- n = np.arange(100)
-+ n = np.arange(100, dtype=np.int64)
- hdu = fits.PrimaryHDU(n)
- hdu.writeto(self.temp('tmp.fits'), clobber=True, checksum=True)
- with fits.open(self.temp('tmp.fits'), checksum=True) as hdul:
-@@ -57,7 +57,7 @@
- assert hdul[0].header['DATASUM'] == '4950'
-
- def test_nonstandard_checksum(self):
-- hdu = fits.PrimaryHDU(np.arange(10.0 ** 6))
-+ hdu = fits.PrimaryHDU(np.arange(10.0 ** 6, dtype=np.float64))
- hdu.writeto(self.temp('tmp.fits'), clobber=True,
- checksum='nonstandard')
- del hdu
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 4da5ddf..ba8d997 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -1,20 +1,8 @@
---- a/astropy/coordinates/tests/test_transformations.py
-+++ b/astropy/coordinates/tests/test_transformations.py
-@@ -319,6 +319,9 @@
- icrs_50.dec.degree != icrs_75.dec.degree)
-
-
-+# See https://github.com/astropy/astropy/issues/2171
-+# powerpc, s390x
-+ at pytest.mark.xfail
- def test_composite_static_matrix_transform():
- """
- Checks to make sure that CompositeStaticMatrixTransform
--- a/astropy/io/fits/tests/test_connect.py
+++ b/astropy/io/fits/tests/test_connect.py
-@@ -104,6 +104,9 @@
- # assert np.all(t1['b'].mask == t2['b'].mask)
- # assert np.all(t1['c'].mask == t2['c'].mask)
+@@ -121,6 +121,9 @@
+ # while reading is to check whether col.null is present. For float columns, col.null
+ # is not initialized
+ # see https://github.com/astropy/astropy/issues/1849
+ # Fails on powerpc, s390
@@ -22,7 +10,7 @@
def test_read_from_fileobj(self, tmpdir):
filename = str(tmpdir.join('test_read_from_fileobj.fits'))
hdu = BinTableHDU(self.data)
-@@ -140,6 +143,9 @@
+@@ -157,6 +160,9 @@
def setup_method(self, method):
warnings.filterwarnings('always')
@@ -32,7 +20,7 @@
def test_read(self, tmpdir):
filename = str(tmpdir.join('test_read.fits'))
self.hdus.writeto(filename)
-@@ -157,6 +163,9 @@
+@@ -175,6 +181,9 @@
assert exc.value.args[0] == 'No table found in hdu=0'
@pytest.mark.parametrize('hdu', [1, 'first'])
@@ -44,7 +32,7 @@
self.hdus.writeto(filename)
--- a/astropy/wcs/tests/test_wcs.py
+++ b/astropy/wcs/tests/test_wcs.py
-@@ -451,6 +451,9 @@
+@@ -353,6 +353,9 @@
run()
@@ -53,10 +41,10 @@
+ at pytest.mark.xfail
def test_to_header_string():
header_string = """
- WCSAXES = 2 / Number of coordinate axes CRPIX1 = 0 / Pixel coordinate of reference point CRPIX2 = 0 / Pixel coordinate of reference point CDELT1 = 1 / Coordinate increment at reference point CDELT2 = 1 / Coordinate increment at reference point CRVAL1 = 0 / Coordinate value at reference point CRVAL2 [...]
+ WCSAXES = 2 / Number of coordinate axes CRPIX1 = 0.0 / Pixel coordinate of reference point CRPIX2 = 0.0 / Pixel coordinate of reference point CDELT1 = 1.0 / Coordinate increment at reference point CDELT2 = 1.0 / Coordinate increment at reference point CRVAL1 = 0.0 / Coordinate value at reference point CRVAL2 [...]
--- a/astropy/wcs/tests/test_wcsprm.py
+++ b/astropy/wcs/tests/test_wcsprm.py
-@@ -637,6 +637,9 @@
+@@ -639,6 +639,9 @@
assert isinstance(w.to_header(), str)
@@ -65,4 +53,4 @@
+ at pytest.mark.xfail
def test_velangl():
w = _wcs.Wcsprm()
- assert w.velangl == 0.0
+ assert np.isnan(w.velangl)
diff --git a/debian/patches/series b/debian/patches/series
index 611fd83..a0afe8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
mark_known_failures.patch
-fix_checksum_test.patch
use_extern_ply.patch
--
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-science-commits
mailing list