[python-astropy] 02/02: Adjust for new version. Specifically, remove the patches (supposed to work now), remove the +dfsg cleanup, adjust copyright.
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed May 14 10:30:59 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 346064ef90e7ed3a3e3bb0283983fe7300ab0701
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed May 14 12:29:32 2014 +0200
Adjust for new version.
Specifically, remove the patches (supposed to work now), remove the +dfsg
cleanup, adjust copyright.
---
debian/changelog | 7 +
debian/copyright | 96 +--------
debian/patches/mark_known_failures.patch | 101 ---------
debian/patches/python3.4.patch | 357 -------------------------------
debian/patches/series | 2 -
debian/rules | 2 +-
debian/watch | 1 -
7 files changed, 14 insertions(+), 552 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 46b4a5c..e895d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-astropy (0.3.2-1) unstable; urgency=low
+
+ * New upstream version. Closes: #743554
+ * Don't repack since all sources are included now
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 14 May 2014 09:21:18 +0200
+
python-astropy (0.3.1+dfsg-1) unstable; urgency=low
* New upstream version
diff --git a/debian/copyright b/debian/copyright
index 16ebe85..47f8752 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ Source: http://www.astropy.org/
Files: * astropy/io/fits/*
astropy/sphinx/ext/compiler_unparse.py astropy/sphinx/ext/comment_eater.py
astropy/sphinx/ext/traitsdoc.py astropy/extern/configobj_*/*
+ astropy/extern/js/jquery.dataTables.js
Copyright: Copyright (c) 2011, Astropy Developers,
2004-2005 Association of Universities for Research in Astronomy,
2006 Enthought, Inc.,
@@ -13,6 +14,7 @@ Copyright: Copyright (c) 2011, Astropy Developers,
2003-2010 Michael Foord, Mark Andrews, Nicola Larosa,
1995-2010 Jean-loup Gailly and Mark Adler,
2001-2011 David M. Beazley (Dabeaz LLC)
+ 2008-2013 Allan Jardine
License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -28,8 +30,9 @@ License: BSD-3-Clause
3. Neither the name of AURA and its representatives nor the names
of the Smithsonian Astrophysical Observatory, Enthought Inc., Michael Foord,
the name of Voidspace, the names of its contributors, David Beazley, or
- Dabeaz LLC may not be used to endorse or promote products derived from this
- software without specific prior written permission.
+ Dabeaz LLC, Allan Jardine nor SpryMedia, may not be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
.
THIS SOFTWARE IS PROVIDED BY ITS AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -46,6 +49,7 @@ License: BSD-3-Clause
Files: cextern/expat/*
Copyright: 2001-2007 Expat maintainers,
1998-2003 Thai Open Source Software Center Ltd and Clark Cooper
+ 2014 jQuery Foundation and other contributors
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -119,91 +123,3 @@ License: LGPL-3
AUSTRALIA
Comment: Note that these files are not used in the package build process, so
the copyright information is included here only as a reference.
-
-Files: cextern/sofa/*
-Copyright: Copyright (C) 2012 Standards Of Fundamental Astronomy Board
- of the International Astronomical Union.
-License: SOFA
- BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING TERMS AND CONDITIONS
- WHICH APPLY TO ITS USE.
- .
- 1. The Software is owned by the IAU SOFA Board ("SOFA").
- .
- 2. Permission is granted to anyone to use the SOFA software for any
- purpose, including commercial applications, free of charge and
- without payment of royalties, subject to the conditions and
- restrictions listed below.
- .
- 3. You (the user) may copy and distribute SOFA source code to others,
- and use and adapt its code and algorithms in your own software,
- on a world-wide, royalty-free basis. That portion of your
- distribution that does not consist of intact and unchanged copies
- of SOFA source code files is a "derived work" that must comply
- with the following requirements:
- .
- a) Your work shall be marked or carry a statement that it
- (i) uses routines and computations derived by you from
- software provided by SOFA under license to you; and
- (ii) does not itself constitute software provided by and/or
- endorsed by SOFA.
- .
- b) The source code of your derived work must contain descriptions
- of how the derived work is based upon, contains and/or differs
- from the original SOFA software.
- .
- c) The name(s) of all routine(s) in your derived work shall not
- include the prefix "iau" or "sofa" or trivial modifications
- thereof such as changes of case.
- .
- d) The origin of the SOFA components of your derived work must
- not be misrepresented; you must not claim that you wrote the
- original software, nor file a patent application for SOFA
- software or algorithms embedded in the SOFA software.
- .
- e) These requirements must be reproduced intact in any source
- distribution and shall apply to anyone to whom you have
- granted a further right to modify the source code of your
- derived work.
- .
- Note that, as originally distributed, the SOFA software is
- intended to be a definitive implementation of the IAU standards,
- and consequently third-party modifications are discouraged. All
- variations, no matter how minor, must be explicitly marked as
- such, as explained above.
- .
- 4. You shall not cause the SOFA software to be brought into
- disrepute, either by misuse, or use for inappropriate tasks, or
- by inappropriate modification.
- .
- 5. The SOFA software is provided "as is" and SOFA makes no warranty
- as to its use or performance. SOFA does not and cannot warrant
- the performance or results which the user may obtain by using the
- SOFA software. SOFA makes no warranties, express or implied, as
- to non-infringement of third party rights, merchantability, or
- fitness for any particular purpose. In no event will SOFA be
- liable to the user for any consequential, incidental, or special
- damages, including any lost profits or lost savings, even if a
- SOFA representative has been advised of such damages, or for any
- claim by any third party.
- .
- 6. The provision of any version of the SOFA software under the terms
- and conditions specified herein does not imply that future
- versions will also be made available under the same terms and
- conditions.
- .
- In any published work or commercial product which uses the SOFA
- software directly, acknowledgement (see www.iausofa.org) is
- appreciated.
- .
- Correspondence concerning SOFA software should be addressed as
- follows:
- .
- By email: sofa at ukho.gov.uk
- By post: IAU SOFA Center
- HM Nautical Almanac Office
- UK Hydrographic Office
- Admiralty Way, Taunton
- Somerset, TA1 2DN
- United Kingdom
-Comment: Note that these files are not used in the package build process, so
- the copyright information is included here only as a reference.
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
deleted file mode 100644
index 3b627ac..0000000
--- a/debian/patches/mark_known_failures.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix doctest and mark other known test failures on big endian
- until they get fixed upstream.
- .
- The patch for pytest_plugins.py is taken from the git version of this file.
-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
-@@ -31,6 +31,7 @@
- [2.3, 4.5, 6.7, 8.9])),
- dtype=[('a', int), ('b', 'U1'), ('c', float)])
-
-+ @pytest.mark.xfail
- def test_simple(self, tmpdir):
- filename = str(tmpdir.join('test_simple.fits'))
- t1 = Table(self.data)
-@@ -38,6 +39,7 @@
- t2 = Table.read(filename)
- assert equal_data(t1, t2)
-
-+ @pytest.mark.xfail
- def test_simple_meta(self, tmpdir):
- filename = str(tmpdir.join('test_simple.fits'))
- t1 = Table(self.data)
-@@ -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')
-
-+ @pytest.mark.xfail
- def test_simple_noextension(self, tmpdir):
- """
- Test that file type is recognized without extension
-@@ -75,6 +78,7 @@
- t2 = Table.read(filename)
- assert equal_data(t1, t2)
-
-+ @pytest.mark.xfail
- def test_with_units(self, tmpdir):
- filename = str(tmpdir.join('test_with_units.fits'))
- t1 = Table(self.data)
-@@ -86,6 +90,7 @@
- assert t2['a'].unit == u.m
- assert t2['c'].unit == u.km / u.s
-
-+ @pytest.mark.xfail
- def test_masked(self, tmpdir):
- filename = str(tmpdir.join('test_masked.fits'))
- t1 = Table(self.data, masked=True)
-@@ -103,6 +108,7 @@
- # assert np.all(t1['b'].mask == t2['b'].mask)
- # assert np.all(t1['c'].mask == t2['c'].mask)
-
-+ @pytest.mark.xfail
- def test_read_from_fileobj(self, tmpdir):
- filename = str(tmpdir.join('test_read_from_fileobj.fits'))
- hdu = BinTableHDU(self.data)
-@@ -139,6 +145,7 @@
- def setup_method(self, method):
- warnings.filterwarnings('always')
-
-+ @pytest.mark.xfail
- def test_read(self, tmpdir):
- filename = str(tmpdir.join('test_read.fits'))
- self.hdus.writeto(filename)
-@@ -156,6 +163,7 @@
- assert exc.value.args[0] == 'No table found in hdu=0'
-
- @pytest.mark.parametrize('hdu', [1, 'first'])
-+ @pytest.mark.xfail
- 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/modeling/tests/test_fitters.py
-+++ b/astropy/modeling/tests/test_fitters.py
-@@ -69,6 +69,7 @@
- self.cheb2 = models.Chebyshev2D(2, 2)
- self.fitter = fitting.LinearLSQFitter()
-
-+ @pytest.mark.xfail
- def test_default_params(self):
- self.cheb2.parameters = np.arange(9)
- p = np.array([1344., 1772., 400., 1860., 2448., 552., 432., 568.,
-@@ -77,6 +78,7 @@
- model = self.fitter(self.cheb2, self.x, self.y, z)
- utils.assert_almost_equal(model.parameters, p)
-
-+ @pytest.mark.xfail
- def test_poly2D_cheb2D(self):
- model = self.fitter(self.cheb2, self.x, self.y, self.z)
- z1 = model(self.x, self.y)
---- a/astropy/modeling/tests/test_input.py
-+++ b/astropy/modeling/tests/test_input.py
-@@ -53,6 +53,7 @@
- m(self.x2)
-
- @pytest.mark.parametrize(('model', 'params'), model2d_params)
-+ @pytest.mark.xfail
- def test_input2D(self, model, params):
- m = model(*params)
- m(self.x, self.y)
diff --git a/debian/patches/python3.4.patch b/debian/patches/python3.4.patch
deleted file mode 100644
index 72361b4..0000000
--- a/debian/patches/python3.4.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-From: Thomas Robitaille <thomas.robitaille at gmail.com>
-Date: Mon, 6 Jan 2014 12:14:00 +0100
-Subject: Fixes for Python 3.4.
- This merges the patches from the pull request #1945: b3942c4, f653064,
- 16ae7a6, 1d51d8e, 07806be, de32f06.
-Origin: https://github.com/astropy/astropy/pull/1945
-Bug-Debian: http://bugs.debian.org/734293
---- a/astropy/logger.py
-+++ b/astropy/logger.py
-@@ -551,9 +551,13 @@
- if isinstance(level, int):
- rv = level
- elif str(level) == level:
-- if level not in logging._levelNames:
-+ if sys.version_info[:2] >= (3, 4):
-+ names = logging._nameToLevel
-+ else:
-+ names = logging._levelNames
-+ if level not in names:
- raise ValueError("Unknown level: %r" % level)
-- rv = logging._levelNames[level]
-+ rv = names[level]
- else:
- raise TypeError("Level not an integer or a valid string: %r" % level)
- return rv
---- a/astropy/nddata/flag_collection.py
-+++ b/astropy/nddata/flag_collection.py
-@@ -40,6 +40,6 @@
- if value.shape == self.shape:
- OrderedDict.__setitem__(self, item, value, **kwargs)
- else:
-- raise ValueError("flags array shape {0:s} does not match data shape {1:s}".format(value.shape, self.shape))
-+ raise ValueError("flags array shape {0} does not match data shape {1}".format(value.shape, self.shape))
- else:
- raise TypeError("flags should be given as a Numpy array")
---- a/astropy/table/np_utils.py
-+++ b/astropy/table/np_utils.py
-@@ -85,7 +85,7 @@
- col_name_count = _counter(col_name_list)
- 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}. '
- 'Change uniq_col_name or table_names args to fix this.'
- .format(repeated_names))
-
---- a/CHANGES.rst
-+++ b/CHANGES.rst
-@@ -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]
-+
- Other Changes and Additions
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
---- a/astropy/cosmology/tests/test_cosmology.py
-+++ b/astropy/cosmology/tests/test_cosmology.py
-@@ -95,40 +95,40 @@
- """ Test string representation of built in classes"""
- cosmo = core.LambdaCDM(70, 0.3, 0.5)
- expected = 'LambdaCDM(H0=70 km / (Mpc s), Om0=0.3, Ode0=0.5, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.LambdaCDM(70, 0.3, 0.5, m_nu=u.Quantity(0.01, u.eV))
- expected = 'LambdaCDM(H0=70 km / (Mpc s), Om0=0.3, Ode0=0.5, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0.01 0.01 0.01] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.FlatLambdaCDM(50.0, 0.27)
- expected = 'FlatLambdaCDM(H0=50 km / (Mpc s), Om0=0.27, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.wCDM(60.0, 0.27, 0.6, w0=-0.8, name='test1')
- expected = 'wCDM(name="test1", H0=60 km / (Mpc s), Om0=0.27, Ode0=0.6, w0=-0.8, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.FlatwCDM(65.0, 0.27, w0=-0.6, name='test2')
- expected = 'FlatwCDM(name="test2", H0=65 km / (Mpc s), Om0=0.27, w0=-0.6, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.w0waCDM(60.0, 0.25, 0.4, w0=-0.6, wa=0.1, name='test3')
- expected = 'w0waCDM(name="test3", H0=60 km / (Mpc s), Om0=0.25, Ode0=0.4, w0=-0.6, wa=0.1, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.Flatw0waCDM(55.0, 0.35, w0=-0.9, wa=-0.2, name='test4')
- expected = 'Flatw0waCDM(name="test4", H0=55 km / (Mpc s), Om0=0.35, w0=-0.9, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.wpwaCDM(50.0, 0.3, 0.3, wp=-0.9, wa=-0.2, zp=0.3, name='test5')
- expected = 'wpwaCDM(name="test5", H0=50 km / (Mpc s), Om0=0.3, Ode0=0.3, wp=-0.9, wa=-0.2, zp=0.3, Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0. 0. 0.] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- cosmo = core.w0wzCDM(55.0, 0.4, 0.8, w0=-1.05, wz=-0.2,
- m_nu=u.Quantity([0.001, 0.01, 0.015], u.eV))
- expected = 'w0wzCDM(H0=55 km / (Mpc s), Om0=0.4, Ode0=0.8, w0=-1.05, wz=-0.2 Tcmb0=2.725 K, Neff=3.04, m_nu=[ 0.001 0.01 0.015] eV)'
-- assert "{0:s}".format(cosmo) == expected
-+ assert str(cosmo) == expected
-
- @pytest.mark.skipif('not HAS_SCIPY')
- def test_flat_z1():
---- a/astropy/cosmology/core.py
-+++ b/astropy/cosmology/core.py
-@@ -244,14 +244,14 @@
- def _namelead(self):
- """ Helper function for constructing __repr__"""
- if self.name is None:
-- return "{0:s}(".format(self.__class__.__name__)
-+ return "{0}(".format(self.__class__.__name__)
- else:
-- return "{0:s}(name=\"{1:s}\", ".format(self.__class__.__name__,
-+ return "{0}(name=\"{1}\", ".format(self.__class__.__name__,
- self.name)
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, Ode0={3:.3g}, "\
-- "Tcmb0={4:.4g}, Neff={5:.3g}, m_nu={6:s})"
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, Ode0={3:.3g}, "\
-+ "Tcmb0={4:.4g}, Neff={5:.3g}, m_nu={6})"
- return retstr.format(self._namelead(), self._H0, self._Om0, self._Ode0,
- self._Tcmb0, self._Neff, self.m_nu)
-
-@@ -1465,8 +1465,8 @@
- return 1.0 / np.sqrt(zp1 ** 3 * (Or * zp1 + Om0) + Ode0)
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, Tcmb0={3:.4g}, "\
-- "Neff={4:.3g}, m_nu={5:s})"
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, Tcmb0={3:.4g}, "\
-+ "Neff={4:.3g}, m_nu={5})"
- return retstr.format(self._namelead(), self._H0, self._Om0,
- self._Tcmb0, self._Neff, self.m_nu)
-
-@@ -1643,8 +1643,8 @@
- Ode0 * zp1 ** (3 * (1 + w0)))
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, Ode0={3:.3g}, w0={4:.3g}, "\
-- "Tcmb0={5:.4g}, Neff={6:.3g}, m_nu={7:s})"
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, Ode0={3:.3g}, w0={4:.3g}, "\
-+ "Tcmb0={5:.4g}, Neff={6:.3g}, m_nu={7})"
- return retstr.format(self._namelead(), self._H0, self._Om0,
- self._Ode0, self._w0, self._Tcmb0, self._Neff,
- self.m_nu)
-@@ -1769,8 +1769,8 @@
- Ode0 * zp1 ** (3 * (1 + w0)))
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, w0={3:.3g}, Tcmb0={4:.4g}, "\
-- "Neff={5:.3g}, m_nu={6:s})"
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, w0={3:.3g}, Tcmb0={4:.4g}, "\
-+ "Neff={5:.3g}, m_nu={6})"
- return retstr.format(self._namelead(), self._H0, self._Om0, self._w0,
- self._Tcmb0, self._Neff, self.m_nu)
-
-@@ -1906,9 +1906,9 @@
- np.exp(-3 * self._wa * z / zp1)
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, "\
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, "\
- "Ode0={3:.3g}, w0={4:.3g}, wa={5:.3g}, Tcmb0={6:.4g}, "\
-- "Neff={7:.3g}, m_nu={8:s})"
-+ "Neff={7:.3g}, m_nu={8})"
- return retstr.format(self._namelead(), self._H0, self._Om0,
- self._Ode0, self._w0, self._wa,
- self._Tcmb0, self._Neff, self.m_nu)
-@@ -1978,8 +1978,8 @@
- self._wa = float(wa)
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, "\
-- "w0={3:.3g}, Tcmb0={4:.4g}, Neff={5:.3g}, m_nu={6:s})"
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, "\
-+ "w0={3:.3g}, Tcmb0={4:.4g}, Neff={5:.3g}, m_nu={6})"
- return retstr.format(self._namelead(), self._H0, self._Om0, self._w0,
- self._Tcmb0, self._Neff, self.m_nu)
-
-@@ -2134,9 +2134,9 @@
- np.exp(-3 * self._wa * z / zp1)
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, Ode0={3:.3g}, wp={4:.3g}, "\
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, Ode0={3:.3g}, wp={4:.3g}, "\
- "wa={5:.3g}, zp={6:.3g}, Tcmb0={7:.4g}, Neff={8:.3g}, "\
-- "m_nu={9:s})"
-+ "m_nu={9})"
- return retstr.format(self._namelead(), self._H0, self._Om0,
- self._Ode0, self._wp, self._wa, self._zp,
- self._Tcmb0, self._Neff, self.m_nu)
-@@ -2279,9 +2279,9 @@
- np.exp(-3 * self._wz * z)
-
- def __repr__(self):
-- retstr = "{0:s}H0={1:.3g}, Om0={2:.3g}, "\
-+ retstr = "{0}H0={1:.3g}, Om0={2:.3g}, "\
- "Ode0={3:.3g}, w0={4:.3g}, wz={5:.3g} Tcmb0={6:.4g}, "\
-- "Neff={7:.3g}, m_nu={8:s})"
-+ "Neff={7:.3g}, m_nu={8})"
- return retstr.format(self._namelead(), self._H0, self._Om0,
- self._Ode0, self._w0, self._wz, self._Tcmb0,
- self._Neff, self.m_nu)
---- a/astropy/vo/validator/tests/data/printcat.out
-+++ b/astropy/vo/validator/tests/data/printcat.out
-@@ -1,43 +1,43 @@
- {
-- "capabilityClass": "ConeSearch",
-- "capabilityStandardID": "ivo://ivoa.net/std/ConeSearch",
-- "capabilityValidationLevel": "",
-- "contentLevel": "#Research#",
-- "description": "USNO-A2.0 is a catalog of 526,280,881 stars, and is based on a re-reduction of the Precision Measuring Machine (PMM) scans that were the basis for the USNO-A1.0 catalog. The major difference between A2.0 and A1.0 is that A1.0 used the Guide Star Catalog (Lasker et al. 1986, see Cat. <I/220>) as its reference frame whereas A2.0 uses the ICRF as realized by the USNO ACT catalog (Urban et al. 1997, see Cat. II/246>). A2.0 presents right ascension and declinatio [...]
-- "duplicatesIgnored": 0,
-- "identifier": "ivo://CDS.VizieR/I/252#out",
-- "interfaceClass": "ParamHTTP",
-- "interfaceRole": "std?",
-- "interfaceVersion": "",
-- "maxRadius": 180.0,
-- "maxRecords": 9999,
-- "publisher": "CDS",
-- "publisherID": "ivo://CDS",
-- "referenceURL": "http://cdsarc.u-strasbg.fr/cgi-bin/Cat?I/252",
-- "regionOfRegard": NaN,
-- "resourceID": "ivo://CDS.VizieR/I/252",
-- "shortName": "I/252",
-- "subject": "#Positional_Data#",
-- "tags": "Catalog",
-- "title": "The USNO-A2.0 Catalogue (Monet+ 1998)",
-- "type": "#Catalog#",
-- "updated": "2011-09-14T20:20:21",
-- "url": "http://vizier.u-strasbg.fr/viz-bin/votable/-A?-source=I/252/out&",
-- "validate_expected": "good",
-- "validate_network_error": null,
-- "validate_nexceptions": 0,
-- "validate_nwarnings": 1,
-- "validate_out_db_name": "good",
-- "validate_version": "1.1",
-+ "capabilityClass": "ConeSearch",
-+ "capabilityStandardID": "ivo://ivoa.net/std/ConeSearch",
-+ "capabilityValidationLevel": "",
-+ "contentLevel": "#Research#",
-+ "description": "USNO-A2.0 is a catalog of 526,280,881 stars, and is based on a re-reduction of the Precision Measuring Machine (PMM) scans that were the basis for the USNO-A1.0 catalog. The major difference between A2.0 and A1.0 is that A1.0 used the Guide Star Catalog (Lasker et al. 1986, see Cat. <I/220>) as its reference frame whereas A2.0 uses the ICRF as realized by the USNO ACT catalog (Urban et al. 1997, see Cat. II/246>). A2.0 presents right ascension and declinatio [...]
-+ "duplicatesIgnored": 0,
-+ "identifier": "ivo://CDS.VizieR/I/252#out",
-+ "interfaceClass": "ParamHTTP",
-+ "interfaceRole": "std?",
-+ "interfaceVersion": "",
-+ "maxRadius": 180.0,
-+ "maxRecords": 9999,
-+ "publisher": "CDS",
-+ "publisherID": "ivo://CDS",
-+ "referenceURL": "http://cdsarc.u-strasbg.fr/cgi-bin/Cat?I/252",
-+ "regionOfRegard": NaN,
-+ "resourceID": "ivo://CDS.VizieR/I/252",
-+ "shortName": "I/252",
-+ "subject": "#Positional_Data#",
-+ "tags": "Catalog",
-+ "title": "The USNO-A2.0 Catalogue (Monet+ 1998)",
-+ "type": "#Catalog#",
-+ "updated": "2011-09-14T20:20:21",
-+ "url": "http://vizier.u-strasbg.fr/viz-bin/votable/-A?-source=I/252/out&",
-+ "validate_expected": "good",
-+ "validate_network_error": null,
-+ "validate_nexceptions": 0,
-+ "validate_nwarnings": 1,
-+ "validate_out_db_name": "good",
-+ "validate_version": "1.1",
- "validate_warning_types": [
- "W22"
-- ],
-+ ],
- "validate_warnings": [
- "./results/f7/bb/d44fbd316338550aed4e1c1a8fc6/vo.xml:13:0: W22: The DEFINITIONS element is deprecated in VOTable 1.1. Ignoring"
-- ],
-- "validate_xmllint": true,
-- "validate_xmllint_content": "./results/f7/bb/d44fbd316338550aed4e1c1a8fc6/vo.xml validates\n",
-- "version": "27-Oct-1998",
-+ ],
-+ "validate_xmllint": true,
-+ "validate_xmllint_content": "./results/f7/bb/d44fbd316338550aed4e1c1a8fc6/vo.xml validates\n",
-+ "version": "27-Oct-1998",
- "waveband": "#Optical#"
- }
-
---- a/astropy/vo/validator/tests/test_validate.py
-+++ b/astropy/vo/validator/tests/test_validate.py
-@@ -121,8 +121,16 @@
- func(fout=fout, *args, **kwargs)
-
- with open(dat_file) as f1:
-- with open(out_file) as f2:
-- assert f1.read() == f2.read()
-+ contents_1 = f1.readlines()
-+ with open(out_file) as f2:
-+ contents_2 = f2.readlines()
-+
-+ assert len(contents_1) == len(contents_2)
-+
-+ # json.dumps() might or might not add trailing whitespace
-+ # http://bugs.python.org/issue16333
-+ for line1, line2 in zip(contents_1, contents_2):
-+ assert line1.rstrip() == line2.rstrip()
-
- def test_tally(self):
- self.gen_cmp(self.r.tally, 'tally.out')
---- a/cextern/cfitsio/swapproc.c
-+++ b/cextern/cfitsio/swapproc.c
-@@ -75,14 +75,14 @@
- swap the bytes in the input short integers: ( 0 1 -> 1 0 )
- */
- {
-+ long ii;
-+ size_t peel = get_peel((void*)&svalues[0], sizeof(svalues[0]), nvals, 16);
-+
- if ((long)svalues % 2 != 0) { /* should not happen */
- ffswap2_slow(svalues, nvals);
- return;
- }
-
-- long ii;
-- size_t peel = get_peel((void*)&svalues[0], sizeof(svalues[0]), nvals, 16);
--
- ffswap2_slow(svalues, peel);
- for (ii = peel; ii < (nvals - peel - (nvals - peel) % 8); ii+=8) {
- swap2_sse2((char*)&svalues[ii]);
---- a/astropy/io/fits/util.py
-+++ b/astropy/io/fits/util.py
-@@ -25,22 +25,6 @@
-
- Generator over all subclasses of a given class, in depth first order.
-
-- >>> class A(object): pass
-- >>> class B(A): pass
-- >>> class C(A): pass
-- >>> class D(B,C): pass
-- >>> class E(D): pass
-- >>>
-- >>> for cls in itersubclasses(A):
-- ... print(cls.__name__)
-- B
-- D
-- E
-- C
-- >>> # get ALL (new-style) classes currently defined
-- >>> [cls.__name__ for cls in itersubclasses(object)]
-- ['type', ...'tuple', ...]
--
- From http://code.activestate.com/recipes/576949/
- """
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eb2ca7a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-mark_known_failures.patch
-python3.4.patch
diff --git a/debian/rules b/debian/rules
index 212e54e..77e3c76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ install-python%:
override_dh_auto_install: $(PYTHON3:%=install-python%)
dh_auto_install
- rm -f $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/astropy/sphinx/themes/bootstrap-astropy/static/*.png
+ rm -f $(CURDIR)/debian/tmp/usr/lib/python*/dist-packages/astropy/sphinx/themes/bootstrap-astropy/static/*.png
override_dh_auto_build:
dh_auto_build -- --use-system-libraries
diff --git a/debian/watch b/debian/watch
index 3402d08..aba2ec5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
# watch control file for uscan
version=3
-opts=dversionmangle=s/\+dfsg// \
http://pypi.python.org/packages/source/a/astropy/astropy-([0-9].*)\.tar\.gz debian uupdate
--
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