[python-astropy] 02/03: Adjust patches for new (bugfix) version
Ole Streicher
olebole-guest at moszumanska.debian.org
Thu Mar 6 11:14:47 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 625b81871aba39b53b146d5267b3c31466b098dd
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Mar 6 11:48:37 2014 +0100
Adjust patches for new (bugfix) version
---
debian/changelog | 6 +
debian/patches/CUNITfix.patch | 63 ------
debian/patches/mark_known_failures.patch | 322 +------------------------------
debian/patches/parallel_fk4_no_fk4.pytch | 65 -------
debian/patches/python3.4.patch | 12 +-
debian/patches/series | 2 -
6 files changed, 20 insertions(+), 450 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 723f06a..46b4a5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (0.3.1+dfsg-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 06 Mar 2014 11:40:55 +0100
+
python-astropy (0.3+dfsg-3) unstable; urgency=low
* Re-integrate 0.3-6 fixes which were left out by another mistake :-)
diff --git a/debian/patches/CUNITfix.patch b/debian/patches/CUNITfix.patch
deleted file mode 100644
index e1bc8b9..0000000
--- a/debian/patches/CUNITfix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 86afcd019cb1c3f49b03bd1ce4c06d1b91bd4d3e Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom at gmail.com>
-Date: Mon, 2 Dec 2013 13:45:33 -0500
-Subject: [PATCH] Fix reporting of which CUNITn element was changed by unitfix
-
----
- CHANGES.rst | 5 +++++
- astropy/wcs/tests/data/validate.txt | 2 +-
- cextern/patches/cunit-fix-message.diff | 11 +++++++++++
- cextern/trim_wcslib.sh | 2 ++
- cextern/wcslib/C/wcs.c | 2 +-
- 5 files changed, 20 insertions(+), 2 deletions(-)
- create mode 100644 cextern/patches/cunit-fix-message.diff
-
---- a/CHANGES.rst
-+++ b/CHANGES.rst
-@@ -653,6 +653,11 @@
- - Fixed a crash that could sometimes occur when running the test suite on
- systems with platform names containing non-ASCII characters. [#1698]
-
-+ - When a unit is "fixed" by `astropy.wcs.WCS.fix` or
-+ `astropy.wcs.Wcsprm.unitfix`, it now correctly reports the
-+ ``CUNIT`` field that was changed. (This requires that astropy
-+ was built with the locally distributed version of wcslib). [#1854]
-+
- Other Changes and Additions
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
---- a/astropy/wcs/tests/data/validate.txt
-+++ b/astropy/wcs/tests/data/validate.txt
-@@ -11,6 +11,6 @@
- WCS key ' ':
- - The WCS transformation has more axes (3) than the image it is
- associated with (0)
-- - 'celfix' made the change 'In CUNIT2 : Mismatched units type
-+ - 'celfix' made the change 'In CUNIT3 : Mismatched units type
- 'length': have 'Hz', want 'm''.
- - 'unitfix' made the change 'Changed units: 'HZ ' -> 'Hz''.
---- /dev/null
-+++ b/cextern/patches/cunit-fix-message.diff
-@@ -0,0 +1,11 @@
-+--- a/wcslib/C/wcs.c
-++++ b/wcslib/C/wcs.c
-+@@ -2037,7 +2037,7 @@ int wcs_units(struct wcsprm *wcs)
-+ if (wcsunitse(wcs->cunit[i], units, &scale, &offset, &power,
-+ &uniterr)) {
-+ wcserr_set(WCSERR_SET(WCSERR_BAD_COORD_TRANS),
-+- "In CUNIT%d%.1s: %s", i, (*wcs->alt)?wcs->alt:"", uniterr->msg);
-++ "In CUNIT%d%.1s: %s", i+1, (*wcs->alt)?wcs->alt:"", uniterr->msg);
-+ free(uniterr);
-+ return WCSERR_BAD_COORD_TRANS;
-+ }
---- a/cextern/wcslib/C/wcs.c
-+++ b/cextern/wcslib/C/wcs.c
-@@ -2037,7 +2037,7 @@
- if (wcsunitse(wcs->cunit[i], units, &scale, &offset, &power,
- &uniterr)) {
- wcserr_set(WCSERR_SET(WCSERR_BAD_COORD_TRANS),
-- "In CUNIT%d%.1s: %s", i, (*wcs->alt)?wcs->alt:"", uniterr->msg);
-+ "In CUNIT%d%.1s: %s", i+1, (*wcs->alt)?wcs->alt:"", uniterr->msg);
- free(uniterr);
- return WCSERR_BAD_COORD_TRANS;
- }
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index c8335da..3b627ac 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -7,7 +7,7 @@ Bug: https://github.com/astropy/astropy/issues/1849
Bug: https://github.com/astropy/astropy/issues/1885
--- a/astropy/io/fits/tests/test_connect.py
+++ b/astropy/io/fits/tests/test_connect.py
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
[2.3, 4.5, 6.7, 8.9])),
dtype=[('a', int), ('b', 'U1'), ('c', float)])
@@ -15,7 +15,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_simple(self, tmpdir):
filename = str(tmpdir.join('test_simple.fits'))
t1 = Table(self.data)
-@@ -37,6 +38,7 @@
+@@ -38,6 +39,7 @@
t2 = Table.read(filename)
assert equal_data(t1, t2)
@@ -23,7 +23,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_simple_meta(self, tmpdir):
filename = str(tmpdir.join('test_simple.fits'))
t1 = Table(self.data)
-@@ -64,6 +66,7 @@
+@@ -65,6 +67,7 @@
assert len(l) == 1
assert l[0].message.startswith('Meta-data keyword ttype1 will be ignored since it conflicts with a FITS reserved keyword')
@@ -31,7 +31,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_simple_noextension(self, tmpdir):
"""
Test that file type is recognized without extension
-@@ -74,6 +77,7 @@
+@@ -75,6 +78,7 @@
t2 = Table.read(filename)
assert equal_data(t1, t2)
@@ -39,7 +39,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_with_units(self, tmpdir):
filename = str(tmpdir.join('test_with_units.fits'))
t1 = Table(self.data)
-@@ -85,6 +89,7 @@
+@@ -86,6 +90,7 @@
assert t2['a'].unit == u.m
assert t2['c'].unit == u.km / u.s
@@ -47,7 +47,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_masked(self, tmpdir):
filename = str(tmpdir.join('test_masked.fits'))
t1 = Table(self.data, masked=True)
-@@ -102,6 +107,7 @@
+@@ -103,6 +108,7 @@
# assert np.all(t1['b'].mask == t2['b'].mask)
# assert np.all(t1['c'].mask == t2['c'].mask)
@@ -55,7 +55,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_read_from_fileobj(self, tmpdir):
filename = str(tmpdir.join('test_read_from_fileobj.fits'))
hdu = BinTableHDU(self.data)
-@@ -138,6 +144,7 @@
+@@ -139,6 +145,7 @@
def setup_method(self, method):
warnings.filterwarnings('always')
@@ -63,7 +63,7 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_read(self, tmpdir):
filename = str(tmpdir.join('test_read.fits'))
self.hdus.writeto(filename)
-@@ -155,6 +162,7 @@
+@@ -156,6 +163,7 @@
assert exc.value.args[0] == 'No table found in hdu=0'
@pytest.mark.parametrize('hdu', [1, 'first'])
@@ -71,312 +71,6 @@ Bug: https://github.com/astropy/astropy/issues/1885
def test_read_with_hdu_1(self, tmpdir, hdu):
filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
self.hdus.writeto(filename)
---- a/astropy/tests/pytest_plugins.py
-+++ b/astropy/tests/pytest_plugins.py
-@@ -14,10 +14,12 @@
- import locale
- import math
- import os
-+import re
- import shutil
- import subprocess
- import sys
- import tempfile
-+import warnings
-
- from .helper import pytest
-
-@@ -32,8 +34,12 @@
- help="fail if any test leaves files open")
-
- parser.addoption("--doctest-plus", action="store_true",
-- help="enable running doctests with additional features not "
-- "found in the normal doctest plugin")
-+ help="enable running doctests with additional "
-+ "features not found in the normal doctest "
-+ "plugin")
-+
-+ parser.addoption("--doctest-rst", action="store_true",
-+ help="enable running doctests in .rst documentation")
-
- parser.addini("doctest_plus", "enable running doctests with additional "
- "features not found in the normal doctest plugin")
-@@ -42,6 +48,59 @@
- "like the norecursedirs option but applies only to doctest "
- "collection", type="args", default=())
-
-+ parser.addini("doctest_rst",
-+ "Run the doctests in the rst documentation",
-+ default=False)
-+
-+
-+class OutputCheckerFix(doctest.OutputChecker):
-+ """
-+ A special doctest OutputChecker that normalizes a number of things common
-+ to astropy doctests.
-+
-+ - Removes u'' prefixes on string literals
-+ - In Numpy dtype strings, removes the leading pipe, i.e. '|S9' ->
-+ 'S9'. Numpy 1.7 no longer includes it in display.
-+ """
-+
-+ _literal_re = re.compile(
-+ r"(\W|^)[uU]([rR]?[\'\"])", re.UNICODE)
-+ _remove_byteorder = re.compile(
-+ r"([\'\"])[|<>]([biufcSaUV][0-9]+)([\'\"])", re.UNICODE)
-+
-+ _original_output_checker = doctest.OutputChecker
-+
-+ def do_fixes(self, want, got):
-+ want = re.sub(self._literal_re, r'\1\2', want)
-+ want = re.sub(self._remove_byteorder, r'\1\2\3', want)
-+
-+ got = re.sub(self._literal_re, r'\1\2', got)
-+ got = re.sub(self._remove_byteorder, r'\1\2\3', got)
-+ return want, got
-+
-+ def check_output(self, want, got, flags):
-+ if flags & FIX:
-+ want, got = self.do_fixes(want, got)
-+ # Can't use super here because doctest.OutputChecker is not a
-+ # new-style class.
-+ return self._original_output_checker.check_output(
-+ self, want, got, flags)
-+
-+ def output_difference(self, want, got, flags):
-+ if flags & FIX:
-+ want, got = self.do_fixes(want, got)
-+ # Can't use super here because doctest.OutputChecker is not a
-+ # new-style class.
-+ return self._original_output_checker.output_difference(
-+ self, want, got, flags)
-+
-+
-+# We monkey-patch in our replacement doctest OutputChecker. Not
-+# great, but there isn't really an API to replace the checker when
-+# using doctest.testfile, unfortunately.
-+FIX = doctest.register_optionflag('FIX')
-+doctest.OutputChecker = OutputCheckerFix
-+
-
- def pytest_configure(config):
- doctest_plugin = config.pluginmanager.getplugin('doctest')
-@@ -49,6 +108,13 @@
- (config.getini('doctest_plus') or config.option.doctest_plus)):
- return
-
-+ # These are the default doctest options we use for everything.
-+ # There shouldn't be any need to manually put them in doctests
-+ # themselves.
-+ opts = (doctest.ELLIPSIS |
-+ doctest.NORMALIZE_WHITESPACE |
-+ FIX)
-+
- class DocTestModulePlus(doctest_plugin.DoctestModule):
- # pytest 2.4.0 defines "collect". Prior to that, it defined
- # "runtest". The "collect" approach is better, because we can
-@@ -64,7 +130,6 @@
-
- # uses internal doctest module parsing mechanism
- finder = DocTestFinderPlus()
-- opts = doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE
- runner = doctest.DebugRunner(verbose=False, optionflags=opts)
- for test in finder.find(module):
- if test.examples: # skip empty doctests
-@@ -75,13 +140,87 @@
- def runtest(self):
- return
-
-- config.pluginmanager.register(DoctestPlus(DocTestModulePlus),
-- 'doctestplus')
-+ class DocTestTextfilePlus(doctest_plugin.DoctestTextfile):
-+ def runtest(self):
-+ # satisfy `FixtureRequest` constructor...
-+ self.funcargs = {}
-+ self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {})
-+ fixture_request = doctest_plugin.FixtureRequest(self)
-+ failed, tot = doctest.testfile(
-+ str(self.fspath), module_relative=False,
-+ optionflags=opts, parser=DocTestParserPlus(),
-+ extraglobs=dict(getfixture=fixture_request.getfuncargvalue),
-+ raise_on_error=True, verbose=False, encoding='utf-8')
-+
-+ class DocTestParserPlus(doctest.DocTestParser):
-+ """
-+ An extension to the builtin DocTestParser that handles the
-+ special directives for skipping tests.
-
-+ The directives are:
-
--class DoctestPlus(object):
-+ - ``.. doctest-skip::``: Skip the next doctest chunk.
-
-- def __init__(self, doctest_module_item_cls):
-+ - ``.. doctest-requires:: module1, module2``: Skip the next
-+ doctest chunk if the given modules/packages are not
-+ installed.
-+
-+ - ``.. doctest-skip-all``: Skip all subsequent doctests.
-+ """
-+
-+ def parse(self, s, name=None):
-+ result = doctest.DocTestParser.parse(self, s, name=name)
-+
-+ # result is a sequence of alternating text chunks and
-+ # doctest.Example objects. We need to look in the text
-+ # chunks for the special directives that help us determine
-+ # whether the following examples should be skipped.
-+
-+ required = []
-+ skip_next = False
-+ skip_all = False
-+
-+ for entry in result:
-+ if isinstance(entry, six.string_types) and entry:
-+ required = []
-+ skip_next = False
-+ lines = entry.strip().splitlines()
-+
-+ if '.. doctest-skip-all' in (x.strip() for x in lines):
-+ skip_all = True
-+ continue
-+
-+ if not len(lines):
-+ continue
-+
-+ last_line = lines[-1]
-+ match = re.match(
-+ r'\.\.\s+doctest-skip\s*::', last_line)
-+ if match:
-+ skip_next = True
-+ continue
-+
-+ match = re.match(
-+ r'\.\.\s+doctest-requires\s*::\s+(.*)',
-+ last_line)
-+ if match:
-+ required = re.split(r'\s*,?\s*', match.group(1))
-+ elif isinstance(entry, doctest.Example):
-+ if (skip_all or skip_next or
-+ not DocTestFinderPlus.check_required_modules(required)):
-+ entry.options[doctest.SKIP] = True
-+
-+ return result
-+
-+ config.pluginmanager.register(
-+ DoctestPlus(DocTestModulePlus, DocTestTextfilePlus,
-+ config.getini('doctest_rst') or config.option.doctest_rst),
-+ 'doctestplus')
-+
-+
-+class DoctestPlus(object):
-+ def __init__(self, doctest_module_item_cls, doctest_textfile_item_cls,
-+ run_rst_doctests):
- """
- doctest_module_item_cls should be a class inheriting
- `pytest.doctest.DoctestItem` and `pytest.File`. This class handles
-@@ -90,8 +229,14 @@
- available at import time, depending on whether or not the doctest
- plugin for py.test is available.
- """
--
- self._doctest_module_item_cls = doctest_module_item_cls
-+ self._doctest_textfile_item_cls = doctest_textfile_item_cls
-+ self._run_rst_doctests = run_rst_doctests
-+
-+ if run_rst_doctests and six.PY3:
-+ warnings.warn(
-+ "Running doctests in .rst files is not yet supported on Python 3")
-+ self._run_rst_doctests = False
-
- def pytest_ignore_collect(self, path, config):
- """Skip paths that match any of the doctest_norecursedirs patterns."""
-@@ -131,11 +276,23 @@
- __doctest_requires__ = {('func1', 'func2'): ['scipy']}
-
- """
--
-- config = parent.config
- if path.ext == '.py':
-+ if path.basename == 'conf.py':
-+ return None
-+
- # Don't override the built-in doctest plugin
- return self._doctest_module_item_cls(path, parent)
-+ elif self._run_rst_doctests and path.ext == '.rst':
-+ # Ignore generated .rst files
-+ parts = str(path).split(os.path.sep)
-+ if (path.basename.startswith('_') or
-+ any(x.startswith('_') for x in parts) or
-+ any(x == 'api' for x in parts)):
-+ return None
-+
-+ # TODO: Get better names on these items when they are
-+ # displayed in py.test output
-+ return self._doctest_textfile_item_cls(path, parent)
-
-
- class DocTestFinderPlus(doctest.DocTestFinder):
-@@ -146,6 +303,20 @@
- # Caches the results of import attempts
- _import_cache = {}
-
-+ @classmethod
-+ def check_required_modules(cls, mods):
-+ for mod in mods:
-+ if mod in cls._import_cache:
-+ return cls._import_cache[mod]
-+ try:
-+ imp.find_module(mod)
-+ except ImportError:
-+ cls._import_cache[mod] = False
-+ return False
-+ else:
-+ cls._import_cache[mod] = True
-+ return True
-+
- def find(self, obj, name=None, module=None, globs=None,
- extraglobs=None):
- tests = doctest.DocTestFinder.find(self, obj, name, module, globs,
-@@ -176,16 +347,8 @@
- if not fnmatch.fnmatch(test.name,
- '.'.join((name, pat))):
- continue
-- for mod in mods:
-- if mod in self._import_cache:
-- return self._import_cache[mod]
-- try:
-- imp.find_module(mod)
-- except ImportError:
-- self._import_cache[mod] = False
-- return False
-- else:
-- self._import_cache[mod] = True
-+ if not self.check_required_modules(mods):
-+ return False
- return True
-
- tests = list(filter(test_filter, tests))
-@@ -289,7 +452,7 @@
- def pytest_report_header(config):
- from .. import __version__
-
-- stdoutencoding = sys.stdout.encoding or 'ascii'
-+ stdoutencoding = getattr(sys.stdout, 'encoding') or 'ascii'
-
- s = "\nRunning tests with Astropy version {0}.\n".format(__version__)
- s += "Running tests in {0}.\n\n".format(" ".join(config.args))
---- a/astropy/io/votable/tests/vo_test.py
-+++ b/astropy/io/votable/tests/vo_test.py
-@@ -127,7 +127,7 @@
- new_dtypes = []
- for dtype in dtypes:
- dtype = list(dtype)
-- dtype[1] = dtype[1].replace(b'<', b'>')
-+ dtype[1] = dtype[1].replace(str('<'), str('>'))
- new_dtypes.append(tuple(dtype))
- dtypes = new_dtypes
- assert table.array.dtype == dtypes
--- a/astropy/modeling/tests/test_fitters.py
+++ b/astropy/modeling/tests/test_fitters.py
@@ -69,6 +69,7 @@
diff --git a/debian/patches/parallel_fk4_no_fk4.pytch b/debian/patches/parallel_fk4_no_fk4.pytch
deleted file mode 100644
index e46a321..0000000
--- a/debian/patches/parallel_fk4_no_fk4.pytch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 830e4e97ad161342d2df6feff4568a49e05d6fe4 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom at gmail.com>
-Date: Tue, 10 Dec 2013 10:59:25 -0500
-Subject: [PATCH] Speed up fk4_no_e_fk4 test.
-
----
- .../tests/accuracy/test_fk4_no_e_fk4.py | 41 ++++++++++------------
- 1 file changed, 18 insertions(+), 23 deletions(-)
-
---- a/astropy/coordinates/tests/accuracy/test_fk4_no_e_fk4.py
-+++ b/astropy/coordinates/tests/accuracy/test_fk4_no_e_fk4.py
-@@ -25,31 +25,26 @@
-
- t = Table.read(os.path.join(ROOT, 'fk4_no_e_fk4.csv'), format='ascii')
-
-- for i in range(len(t)):
-+ # FK4 to FK5
-+ c1 = FK4(t['ra_in'], t['dec_in'],
-+ unit=(u.degree, u.degree),
-+ obstime=Time(t['obstime'], scale='utc'))
-+ c2 = c1.transform_to(FK4NoETerms)
-+
-+ # Find difference
-+ diff = angular_separation(c2.ra.radian, c2.dec.radian,
-+ np.radians(t['ra_fk4ne']), np.radians(t['dec_fk4ne']))
-+
-+ assert np.all(np.degrees(diff) * 3600. < TOLERANCE)
-+
-+ # FK5 to FK4
-+ c1 = FK4NoETerms(t['ra_in'], t['dec_in'],
-+ unit=(u.degree, u.degree),
-+ obstime=Time(t['obstime'], scale='utc'))
-+ c2 = c1.transform_to(FK4)
-+
-+ # Find difference
-+ diff = angular_separation(c2.ra.radian, c2.dec.radian,
-+ np.radians(t['ra_fk4']), np.radians(t['dec_fk4']))
-
-- # Extract row
-- r = t[i]
--
-- # FK4 to FK5
-- c1 = FK4(r['ra_in'], r['dec_in'],
-- unit=(u.degree, u.degree),
-- obstime=Time(r['obstime'], scale='utc'))
-- c2 = c1.transform_to(FK4NoETerms)
--
-- # Find difference
-- diff = angular_separation(c2.ra.radian, c2.dec.radian,
-- np.radians(r['ra_fk4ne']), np.radians(r['dec_fk4ne']))
--
-- assert np.degrees(diff) * 3600. < TOLERANCE
--
-- # FK5 to FK4
-- c1 = FK4NoETerms(r['ra_in'], r['dec_in'],
-- unit=(u.degree, u.degree),
-- obstime=Time(r['obstime'], scale='utc'))
-- c2 = c1.transform_to(FK4)
--
-- # Find difference
-- diff = angular_separation(c2.ra.radian, c2.dec.radian,
-- np.radians(r['ra_fk4']), np.radians(r['dec_fk4']))
--
-- assert np.degrees(diff) * 3600. < TOLERANCE
-+ assert np.all(np.degrees(diff) * 3600. < TOLERANCE)
diff --git a/debian/patches/python3.4.patch b/debian/patches/python3.4.patch
index 0afe994..72361b4 100644
--- a/debian/patches/python3.4.patch
+++ b/debian/patches/python3.4.patch
@@ -35,9 +35,9 @@ Bug-Debian: http://bugs.debian.org/734293
raise TypeError("flags should be given as a Numpy array")
--- a/astropy/table/np_utils.py
+++ b/astropy/table/np_utils.py
-@@ -81,7 +81,7 @@
+@@ -85,7 +85,7 @@
col_name_count = _counter(col_name_list)
- repeated_names = [name for name, count in col_name_count.items() if count > 1]
+ repeated_names = [name for name, count in six.iteritems(col_name_count) if count > 1]
if repeated_names:
- raise TableMergeError('Merging column names resulted in duplicates: {0:s}. '
+ raise TableMergeError('Merging column names resulted in duplicates: {0}. '
@@ -46,9 +46,9 @@ Bug-Debian: http://bugs.debian.org/734293
--- a/CHANGES.rst
+++ b/CHANGES.rst
-@@ -658,6 +658,8 @@
- ``CUNIT`` field that was changed. (This requires that astropy
- was built with the locally distributed version of wcslib). [#1854]
+@@ -893,6 +893,8 @@
+ - Fixed a crash that could sometimes occur when running the test suite on
+ systems with platform names containing non-ASCII characters. [#1698]
+ - Fixed compatibility with Python 3.4. [#1945]
+
@@ -332,7 +332,7 @@ Bug-Debian: http://bugs.debian.org/734293
swap2_sse2((char*)&svalues[ii]);
--- a/astropy/io/fits/util.py
+++ b/astropy/io/fits/util.py
-@@ -24,22 +24,6 @@
+@@ -25,22 +25,6 @@
Generator over all subclasses of a given class, in depth first order.
diff --git a/debian/patches/series b/debian/patches/series
index 7c30f63..eb2ca7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
mark_known_failures.patch
-parallel_fk4_no_fk4.pytch
-CUNITfix.patch
python3.4.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-astropy.git
More information about the debian-science-commits
mailing list