[python-astropy] 01/03: Merge branch 'upstream' into debian

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 ae1e2afe374b382979f78b9a5cc1c116d94d4744
Merge: 1651944 c86eaa2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Mar 6 11:40:26 2014 +0100

    Merge branch 'upstream' into debian
    
    Conflicts:
    	CHANGES.rst
    	PKG-INFO
    	astropy/__init__.py
    	astropy/config/paths.py
    	astropy/convolution/boundary_extend.c
    	astropy/convolution/boundary_fill.c
    	astropy/convolution/boundary_none.c
    	astropy/convolution/boundary_wrap.c
    	astropy/convolution/convolve.py
    	astropy/convolution/core.py
    	astropy/convolution/kernels.py
    	astropy/convolution/tests/test_kernel_class.py
    	astropy/coordinates/angles.py
    	astropy/coordinates/builtin_systems.py
    	astropy/coordinates/coordsystems.py
    	astropy/coordinates/tests/accuracy/test_fk4_no_e_fk4.py
    	astropy/coordinates/tests/test_angles.py
    	astropy/coordinates/tests/test_arrays.py
    	astropy/coordinates/tests/test_transformations.py
    	astropy/coordinates/transformations.py
    	astropy/cosmology/funcs.py
    	astropy/io/ascii/core.py
    	astropy/io/fits/card.py
    	astropy/io/fits/column.py
    	astropy/io/fits/connect.py
    	astropy/io/fits/convenience.py
    	astropy/io/fits/diff.py
    	astropy/io/fits/file.py
    	astropy/io/fits/fitsrec.py
    	astropy/io/fits/hdu/base.py
    	astropy/io/fits/hdu/compressed.py
    	astropy/io/fits/hdu/groups.py
    	astropy/io/fits/hdu/table.py
    	astropy/io/fits/header.py
    	astropy/io/fits/tests/test_connect.py
    	astropy/io/fits/tests/test_core.py
    	astropy/io/fits/tests/test_diff.py
    	astropy/io/fits/tests/test_header.py
    	astropy/io/fits/tests/test_table.py
    	astropy/io/fits/util.py
    	astropy/io/misc/hdf5.py
    	astropy/io/votable/converters.py
    	astropy/io/votable/tests/data/regression.bin.tabledata.truth.1.1.xml
    	astropy/io/votable/tests/data/regression.bin.tabledata.truth.1.3.xml
    	astropy/io/votable/tests/data/regression.xml
    	astropy/io/votable/tests/vo_test.py
    	astropy/io/votable/tree.py
    	astropy/modeling/core.py
    	astropy/modeling/fitting.py
    	astropy/modeling/functional_models.py
    	astropy/modeling/parameters.py
    	astropy/modeling/tests/example_models.py
    	astropy/modeling/tests/test_functional_models.py
    	astropy/modeling/tests/test_models.py
    	astropy/modeling/tests/test_parameters.py
    	astropy/modeling/tests/test_rotations.py
    	astropy/sphinx/conf.py
    	astropy/stats/funcs.py
    	astropy/table/__init__.py
    	astropy/table/groups.py
    	astropy/table/np_utils.py
    	astropy/table/operations.py
    	astropy/table/pprint.py
    	astropy/table/setup_package.py
    	astropy/table/table.py
    	astropy/table/tests/test_column.py
    	astropy/table/tests/test_pprint.py
    	astropy/table/tests/test_table.py
    	astropy/tests/helper.py
    	astropy/tests/pytest_plugins.py
    	astropy/time/core.py
    	astropy/time/erfa_time.c
    	astropy/time/tests/test_basic.py
    	astropy/time/tests/test_comparisons.py
    	astropy/time/tests/test_delta.py
    	astropy/time/tests/test_quantity_interaction.py
    	astropy/time/tests/test_ut1.py
    	astropy/units/core.py
    	astropy/units/equivalencies.py
    	astropy/units/format/cds.py
    	astropy/units/format/cds_lextab.py
    	astropy/units/format/generic.py
    	astropy/units/format/generic_lextab.py
    	astropy/units/format/generic_parsetab.py
    	astropy/units/format/vounit.py
    	astropy/units/quantity.py
    	astropy/units/si.py
    	astropy/units/tests/test_equivalencies.py
    	astropy/units/tests/test_format.py
    	astropy/units/tests/test_quantity.py
    	astropy/units/tests/test_quantity_ufuncs.py
    	astropy/units/tests/test_units.py
    	astropy/units/utils.py
    	astropy/utils/compat/argparse.py
    	astropy/utils/console.py
    	astropy/utils/exceptions.py
    	astropy/utils/misc.py
    	astropy/utils/timer.py
    	astropy/version.py
    	astropy/vo/client/conesearch.py
    	astropy/wcs/src/docstrings.c
    	astropy/wcs/tests/data/validate.txt
    	astropy/wcs/tests/test_wcs.py
    	astropy/wcs/tests/test_wcsprm.py
    	astropy/wcs/wcs.py
    	docs/config/index.rst
    	docs/convolution/kernels.rst
    	docs/coordinates/angles.rst
    	docs/coordinates/distances.rst
    	docs/coordinates/formatting.rst
    	docs/coordinates/index.rst
    	docs/coordinates/matching.rst
    	docs/coordinates/separations.rst
    	docs/cosmology/index.rst
    	docs/development/codeguide.rst
    	docs/development/docrules.rst
    	docs/development/testguide.rst
    	docs/io/ascii/fixed_width_gallery.rst
    	docs/io/fits/appendix/history.rst
    	docs/io/fits/index.rst
    	docs/io/unified.rst
    	docs/io/votable/index.rst
    	docs/known_issues.rst
    	docs/modeling/fitting.rst
    	docs/modeling/index.rst
    	docs/overview.rst
    	docs/table/construct_table.rst
    	docs/table/index.rst
    	docs/table/io.rst
    	docs/table/operations.rst
    	docs/time/index.rst
    	docs/units/combining_and_defining.rst
    	docs/units/conversion.rst
    	docs/units/equivalencies.rst
    	docs/units/format.rst
    	docs/units/index.rst
    	docs/units/quantity.rst
    	docs/vo/client.rst
    	docs/vo/conesearch.rst
    	docs/vo/validator.rst
    	docs/wcs/examples/from_file.py
    	docs/wcs/index.rst
    	docs/whatsnew/0.3.rst
    	setup.py

 CHANGES.rst                                        |   240 +
 PKG-INFO                                           |     4 +-
 astropy/__init__.py                                |    21 +-
 astropy/config/configuration.py                    |     6 +-
 astropy/config/paths.py                            |     8 +-
 astropy/config/tests/test_configs.py               |     7 +
 astropy/convolution/boundary_extend.c              |  8608 ++++++++++
 astropy/convolution/boundary_fill.c                |  8737 ++++++++++
 astropy/convolution/boundary_none.c                |  8291 ++++++++++
 astropy/convolution/boundary_wrap.c                |  8608 ++++++++++
 astropy/convolution/convolve.py                    |    11 +-
 astropy/convolution/core.py                        |    12 +-
 astropy/convolution/kernels.py                     |    48 +-
 astropy/convolution/tests/test_kernel_class.py     |    50 +-
 astropy/coordinates/angle_utilities.py             |     4 +-
 astropy/coordinates/angles.py                      |    27 +-
 astropy/coordinates/builtin_systems.py             |     8 +-
 astropy/coordinates/coordsystems.py                |    59 +-
 .../tests/accuracy/test_fk4_no_e_fk4.py            |    41 +-
 astropy/coordinates/tests/test_angles.py           |     6 +
 astropy/coordinates/tests/test_arrays.py           |    26 +-
 astropy/coordinates/tests/test_pickle.py           |    15 +
 astropy/coordinates/tests/test_transformations.py  |    19 +
 astropy/coordinates/transformations.py             |    13 +-
 astropy/cosmology/funcs.py                         |     2 +-
 astropy/io/ascii/core.py                           |    39 +-
 astropy/io/ascii/latex.py                          |     2 +-
 astropy/io/ascii/tests/test_read.py                |     9 +
 .../tests/{test_read.py => test_read_unicode.py}   |    19 +-
 astropy/io/ascii/tests/test_write_unicode.py       |   288 +
 astropy/io/fits/card.py                            |   240 +-
 astropy/io/fits/column.py                          |    28 +-
 astropy/io/fits/connect.py                         |    11 +-
 astropy/io/fits/convenience.py                     |   123 +-
 astropy/io/fits/diff.py                            |   149 +-
 astropy/io/fits/file.py                            |     6 +-
 astropy/io/fits/fitsrec.py                         |   130 +-
 astropy/io/fits/hdu/base.py                        |   184 +-
 astropy/io/fits/hdu/compressed.py                  |   603 +-
 astropy/io/fits/hdu/groups.py                      |     7 +-
 astropy/io/fits/hdu/hdulist.py                     |    26 +-
 astropy/io/fits/hdu/image.py                       |    47 +-
 astropy/io/fits/hdu/nonstandard.py                 |     4 +-
 astropy/io/fits/hdu/streaming.py                   |    27 +-
 astropy/io/fits/hdu/table.py                       |   218 +-
 astropy/io/fits/header.py                          |   681 +-
 astropy/io/fits/scripts/fitscheck.py               |    21 +-
 astropy/io/fits/tests/test_checksum.py             |   217 +-
 astropy/io/fits/tests/test_connect.py              |    15 +-
 astropy/io/fits/tests/test_core.py                 |    53 +-
 astropy/io/fits/tests/test_diff.py                 |    21 +
 astropy/io/fits/tests/test_header.py               |   248 +-
 astropy/io/fits/tests/test_image.py                |   165 +
 astropy/io/fits/tests/test_table.py                |    74 +
 astropy/io/fits/util.py                            |     6 +-
 astropy/io/misc/hdf5.py                            |    19 +-
 astropy/io/misc/tests/test_hdf5.py                 |     2 +-
 astropy/io/votable/converters.py                   |   126 +-
 astropy/io/votable/exceptions.py                   |    22 +-
 astropy/io/votable/src/tablewriter.c               |    52 +-
 .../data/regression.bin.tabledata.truth.1.1.xml    |    28 +-
 .../data/regression.bin.tabledata.truth.1.3.xml    |     4 +-
 astropy/io/votable/tests/data/regression.xml       |     4 +-
 astropy/io/votable/tests/data/validation.txt       |   112 +-
 astropy/io/votable/tests/vo_test.py                |    12 +-
 astropy/io/votable/tree.py                         |   108 +-
 astropy/io/votable/xmlutil.py                      |    10 +-
 astropy/modeling/core.py                           |    54 +-
 astropy/modeling/fitting.py                        |    28 +-
 astropy/modeling/functional_models.py              |   164 +-
 astropy/modeling/parameters.py                     |     5 +-
 astropy/modeling/tests/example_models.py           |     2 +
 astropy/modeling/tests/test_core.py                |    72 +
 astropy/modeling/tests/test_functional_models.py   |    36 +
 astropy/modeling/tests/test_models.py              |    12 +
 astropy/modeling/tests/test_parameters.py          |    64 +
 astropy/modeling/tests/test_polynomial.py          |   103 +
 astropy/modeling/tests/test_rotations.py           |     2 +
 astropy/nddata/nduncertainty.py                    |     2 +-
 astropy/sphinx/conf.py                             |     7 +-
 astropy/sphinx/ext/astropyautosummary.py           |     8 +-
 astropy/sphinx/ext/automodapi.py                   |    23 +-
 astropy/sphinx/ext/doctest.py                      |    33 +
 astropy/stats/funcs.py                             |    41 +-
 astropy/table/__init__.py                          |     4 +
 astropy/table/_np_utils.c                          |  7096 ++++++++
 astropy/table/groups.py                            |    24 +-
 astropy/table/np_utils.py                          |    58 +-
 astropy/table/operations.py                        |    21 +-
 astropy/table/pprint.py                            |    60 +-
 astropy/table/setup_package.py                     |     4 +-
 astropy/table/table.py                             |   247 +-
 astropy/table/tests/test_column.py                 |    78 +-
 astropy/table/tests/test_pickle.py                 |    72 +
 astropy/table/tests/test_pprint.py                 |    51 +-
 astropy/table/tests/test_table.py                  |   137 +-
 astropy/tests/helper.py                            |   137 +-
 astropy/tests/pytest_plugins.py                    |   226 +-
 astropy/time/core.py                               |   189 +-
 astropy/time/erfa_time.c                           | 16574 +++++++++++++++++++
 astropy/time/tests/test_basic.py                   |    32 +-
 astropy/time/tests/test_comparisons.py             |    16 +
 astropy/time/tests/test_delta.py                   |    79 +
 astropy/time/tests/test_quantity_interaction.py    |     5 -
 astropy/time/tests/test_ut1.py                     |    10 +
 astropy/units/core.py                              |   305 +-
 astropy/units/equivalencies.py                     |     4 +-
 astropy/units/format/cds.py                        |    42 +-
 astropy/units/format/cds_lextab.py                 |     6 +-
 astropy/units/format/fits.py                       |    21 +-
 astropy/units/format/generic.py                    |    60 +-
 astropy/units/format/generic_lextab.py             |     6 +-
 astropy/units/format/generic_parsetab.py           |    98 +-
 astropy/units/format/vounit.py                     |    24 +-
 astropy/units/quantity.py                          |   162 +-
 astropy/units/si.py                                |     2 +-
 astropy/units/tests/test_equivalencies.py          |     5 +-
 astropy/units/tests/test_format.py                 |     7 +-
 astropy/units/tests/test_quantity.py               |    55 +-
 astropy/units/tests/test_quantity_ufuncs.py        |     9 +
 astropy/units/tests/test_units.py                  |   108 +-
 astropy/units/utils.py                             |    76 +-
 astropy/utils/compat/_argparse/__init__.py         |  2363 +++
 astropy/utils/compat/argparse.py                   |    10 +-
 astropy/utils/console.py                           |    15 +-
 astropy/utils/data.py                              |     4 +-
 astropy/utils/exceptions.py                        |     2 +-
 astropy/utils/misc.py                              |    78 +
 astropy/utils/tests/test_compat.py                 |     2 +
 astropy/utils/timer.py                             |     2 +-
 astropy/version.py                                 |    25 +
 astropy/vo/client/conesearch.py                    |    15 +-
 astropy/wcs/__init__.py                            |     8 +
 astropy/wcs/docstrings.py                          |     7 +-
 astropy/wcs/include/astropy_wcs/docstrings.h       |     2 +-
 astropy/wcs/src/docstrings.c                       |   910 +
 astropy/wcs/src/pipeline.c                         |     6 +
 astropy/wcs/src/pyutil.c                           |     2 +-
 astropy/wcs/src/wcslib_wrap.c                      |    14 +-
 astropy/wcs/tests/data/2wcses.hdr                  |     1 +
 astropy/wcs/tests/data/invalid_header.hdr          |     1 +
 astropy/wcs/tests/data/nonstandard_units.hdr       |     2 +-
 astropy/wcs/tests/data/sub-segfault.hdr            |    28 +
 astropy/wcs/tests/data/validate.txt                |     2 +-
 astropy/wcs/tests/test_wcs.py                      |    97 +
 astropy/wcs/tests/test_wcsprm.py                   |    13 +-
 astropy/wcs/wcs.py                                 |    86 +-
 cextern/patches/cunit-fix-message.diff             |    11 +
 cextern/patches/unit-translate-information.diff    |    20 +
 cextern/trim_wcslib.sh                             |     3 +
 cextern/wcslib/C/wcs.c                             |     2 +-
 cextern/wcslib/C/wcsfix.c                          |     4 +-
 docs/Makefile                                      |     6 +-
 docs/config/index.rst                              |     2 +-
 docs/convolution/kernels.rst                       |     4 +-
 docs/coordinates/angles.rst                        |    16 +-
 docs/coordinates/distances.rst                     |    26 +-
 docs/coordinates/formatting.rst                    |     8 +
 docs/coordinates/index.rst                         |    20 +-
 docs/coordinates/matching.rst                      |     6 +-
 docs/coordinates/separations.rst                   |    10 +-
 docs/cosmology/index.rst                           |    52 +-
 docs/development/codeguide.rst                     |     5 +
 docs/development/docrules.rst                      |     4 +-
 docs/development/testguide.rst                     |   402 +-
 docs/io/ascii/fixed_width_gallery.rst              |    18 +-
 docs/io/fits/api/images.rst                        |     8 +
 docs/io/fits/appendix/faq.rst                      |     4 +-
 docs/io/fits/appendix/header_transition.rst        |   427 +
 docs/io/fits/appendix/history.rst                  |   233 +-
 docs/io/fits/index.rst                             |   257 +-
 docs/io/fits/usage/headers.rst                     |    78 +-
 docs/io/fits/usage/image.rst                       |   100 +-
 docs/io/fits/usage/scripts.rst                     |     2 +-
 docs/io/fits/usage/table.rst                       |    54 +-
 docs/io/fits/usage/unfamiliar.rst                  |     8 +-
 docs/io/fits/usage/verification.rst                |    53 +-
 docs/io/unified.rst                                |     2 +-
 docs/io/votable/index.rst                          |    32 +-
 docs/known_issues.rst                              |    75 +
 docs/modeling/fitting.rst                          |     7 +-
 docs/modeling/index.rst                            |     2 +-
 docs/overview.rst                                  |    59 +-
 docs/stats/index.rst                               |    23 +-
 docs/table/access_table.rst                        |     2 +-
 docs/table/construct_table.rst                     |     6 +-
 docs/table/index.rst                               |     4 +-
 docs/table/io.rst                                  |     2 +-
 docs/table/operations.rst                          |     8 +-
 docs/time/index.rst                                |    12 +-
 docs/units/combining_and_defining.rst              |    21 +
 docs/units/conversion.rst                          |     2 +-
 docs/units/equivalencies.rst                       |    16 +-
 docs/units/format.rst                              |    28 +-
 docs/units/index.rst                               |    12 +-
 docs/units/quantity.rst                            |    52 +-
 docs/vo/client.rst                                 |     2 +
 docs/vo/conesearch.rst                             |     2 +
 docs/vo/validator.rst                              |    12 +-
 docs/wcs/examples/from_file.py                     |    10 +-
 docs/wcs/examples/programmatic.py                  |    12 +-
 docs/wcs/index.rst                                 |    38 +
 docs/whatsnew/0.2.rst                              |     2 +
 docs/whatsnew/0.3.rst                              |     8 +-
 setup.py                                           |     2 +-
 205 files changed, 68908 insertions(+), 2880 deletions(-)

-- 
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