[python-astropy] 01/02: Merge branch 'upstream' into debian
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 5b61c0b3bb39beb0360029ba1d94517dbad6d22d
Merge: f7d9f4e 05c8aa9
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed May 14 09:14:08 2014 +0200
Merge branch 'upstream' into debian
CHANGES.rst | 466 +-
PKG-INFO | 4 +-
README.rst | 5 -
astropy/constants/si.py | 2 +-
astropy/convolution/boundary_extend.c | 2 +-
astropy/convolution/boundary_fill.c | 2 +-
astropy/convolution/boundary_none.c | 2 +-
astropy/convolution/boundary_wrap.c | 2 +-
astropy/convolution/convolve.py | 2 +-
astropy/convolution/kernels.py | 34 +-
astropy/convolution/tests/test_discretize.py | 2 +-
astropy/convolution/utils.py | 16 +-
astropy/coordinates/angle_utilities.py | 20 +-
astropy/coordinates/angles.py | 96 +-
astropy/coordinates/coordsystems.py | 6 +-
astropy/coordinates/distances.py | 26 +-
astropy/coordinates/name_resolve.py | 15 +-
astropy/coordinates/tests/test_angles.py | 33 +-
astropy/coordinates/tests/test_api.py | 7 -
astropy/coordinates/tests/test_arrays.py | 23 +-
astropy/coordinates/tests/test_distance.py | 42 +-
astropy/coordinates/tests/test_formatting.py | 24 +-
astropy/coordinates/tests/test_transformations.py | 21 +-
astropy/cosmology/core.py | 216 +-
astropy/cosmology/tests/test_cosmology.py | 100 +-
astropy/extern/js/jquery-1.11.0.js | 10337 ++++++++++++++++
astropy/extern/js/jquery.dataTables.js | 12099 +++++++++++++++++++
astropy/extern/setup_package.py | 9 +
astropy/io/ascii/cds.py | 20 +-
astropy/io/ascii/core.py | 8 +
astropy/io/ascii/setup_package.py | 1 +
astropy/io/ascii/tests/t/cds/multi/ReadMe | 3 +-
astropy/io/ascii/tests/t/cds/multi/lp944-20.dat | 18 +
astropy/io/ascii/tests/t/vizier/table1.dat | 8 +-
.../io/ascii/tests/test_cds_header_from_readme.py | 6 +
astropy/io/ascii/tests/test_read.py | 17 +
astropy/io/ascii/ui.py | 4 +-
astropy/io/fits/card.py | 121 +-
astropy/io/fits/column.py | 9 +-
astropy/io/fits/connect.py | 8 +-
astropy/io/fits/fitsrec.py | 42 +
astropy/io/fits/hdu/compressed.py | 4 +
astropy/io/fits/hdu/hdulist.py | 4 +-
astropy/io/fits/hdu/image.py | 2 +
astropy/io/fits/hdu/table.py | 58 +-
astropy/io/fits/header.py | 40 +-
astropy/io/fits/setup_package.py | 4 +-
astropy/io/fits/src/compressionmodule.c | 17 +-
astropy/io/fits/tests/test_checksum.py | 19 +-
astropy/io/fits/tests/test_connect.py | 21 +-
astropy/io/fits/tests/test_core.py | 53 +
astropy/io/fits/tests/test_division.py | 3 +-
astropy/io/fits/tests/test_hdulist.py | 31 +-
astropy/io/fits/tests/test_header.py | 88 +-
astropy/io/fits/tests/test_image.py | 50 +
astropy/io/fits/tests/test_table.py | 96 +-
astropy/io/fits/tests/util.py | 4 +-
astropy/io/fits/util.py | 17 +-
astropy/io/misc/tests/test_hdf5.py | 9 +-
astropy/io/registry.py | 5 +-
astropy/io/tests/test_registry.py | 11 +
astropy/io/votable/converters.py | 14 +-
astropy/io/votable/src/tablewriter.c | 2 +-
astropy/io/votable/tests/converter_test.py | 2 +-
.../data/regression.bin.tabledata.truth.1.1.xml | 4 +-
.../data/regression.bin.tabledata.truth.1.3.xml | 4 +-
astropy/io/votable/tests/vo_test.py | 14 +-
astropy/io/votable/tree.py | 57 +
astropy/io/votable/validator/result.py | 13 +-
astropy/logger.py | 8 +-
astropy/modeling/core.py | 66 +-
astropy/modeling/functional_models.py | 51 +-
astropy/modeling/polynomial.py | 198 +-
astropy/modeling/setup_package.py | 5 +-
astropy/modeling/tests/data/hst_sip.hdr | 42 +
astropy/modeling/tests/data/irac_sip.hdr | 241 +
astropy/modeling/tests/example_models.py | 4 +-
astropy/modeling/tests/test_fitters.py | 4 +-
astropy/modeling/tests/test_input.py | 8 +-
astropy/modeling/tests/test_models.py | 14 +-
astropy/modeling/tests/test_parameters.py | 2 +-
astropy/modeling/tests/test_polynomial.py | 81 +-
astropy/nddata/flag_collection.py | 2 +-
astropy/setup_helpers.py | 99 +-
astropy/sphinx/conf.py | 2 +-
astropy/sphinx/ext/tests/test_automodapi.py | 23 +-
astropy/stats/funcs.py | 4 +-
astropy/stats/tests/test_funcs.py | 21 +
astropy/table/_np_utils.c | 2 +-
astropy/table/jsviewer.py | 57 +-
astropy/table/np_utils.py | 2 +-
astropy/table/pprint.py | 7 +-
astropy/table/setup_package.py | 4 +-
astropy/table/tests/test_operations.py | 29 +-
astropy/table/tests/test_pprint.py | 10 +-
astropy/tests/helper.py | 30 +-
astropy/tests/pytest_plugins.py | 30 +-
astropy/time/core.py | 37 +-
astropy/time/erfa_time.c | 2 +-
astropy/time/tests/test_pickle.py | 27 +
astropy/units/equivalencies.py | 15 +-
astropy/units/quantity.py | 107 +-
astropy/units/si.py | 3 +-
astropy/units/tests/test_quantity.py | 15 +
astropy/units/tests/test_quantity_array_methods.py | 34 +
astropy/utils/compat/misc.py | 25 +-
astropy/utils/console.py | 23 +-
astropy/utils/data.py | 55 +-
astropy/utils/tests/test_data.py | 71 +-
astropy/utils/xml/src/iterparse.c | 1 -
astropy/version.py | 6 +-
astropy/vo/client/conesearch.py | 13 +-
astropy/vo/client/tests/test_vo.py | 44 +-
astropy/vo/client/vos_catalog.py | 2 +-
astropy/vo/validator/tests/data/printcat.out | 70 +-
astropy/vo/validator/tests/test_validate.py | 12 +-
astropy/wcs/include/astropy_wcs/astropy_wcs_api.h | 8 +-
astropy/wcs/include/astropy_wcs/docstrings.h | 4 -
astropy/wcs/include/wcslib/cel.h | 435 +
astropy/wcs/include/wcslib/lin.h | 448 +
astropy/wcs/include/wcslib/prj.h | 763 ++
astropy/wcs/include/wcslib/spc.h | 884 ++
astropy/wcs/include/wcslib/spx.h | 538 +
astropy/wcs/include/wcslib/tab.h | 580 +
astropy/wcs/include/wcslib/wcs.h | 1535 +++
astropy/wcs/include/wcslib/wcserr.h | 253 +
astropy/wcs/include/wcslib/wcsmath.h | 70 +
astropy/wcs/include/wcslib/wcsprintf.h | 150 +
astropy/wcs/setup_package.py | 63 +-
astropy/wcs/src/docstrings.c | 6385 ++++++++--
astropy/wcs/src/pyutil.c | 1 -
astropy/wcs/src/wcslib_wrap.c | 13 +-
astropy/wcs/tests/test_wcs.py | 11 +-
astropy/wcs/wcs.py | 4 +-
docs/cosmology/index.rst | 41 +-
docs/development/docguide.rst | 2 +-
docs/development/testguide.rst | 4 +
docs/install.rst | 8 +-
docs/io/fits/appendix/history.rst | 78 +-
docs/known_issues.rst | 12 +
docs/modeling/index.rst | 2 +-
docs/modeling/models.rst | 22 +-
docs/table/construct_table.rst | 10 +-
docs/table/operations.rst | 33 +-
docs/time/index.rst | 36 +-
docs/units/equivalencies.rst | 10 -
docs/wcs/index.rst | 8 +
licenses/DATATABLES_LICENSE.rst | 29 +
licenses/JQUERY_LICENSE.rst | 21 +
setup.cfg | 2 +-
setup.py | 2 +-
151 files changed, 36501 insertions(+), 2096 deletions(-)
--
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