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

Ole Streicher olebole-guest at alioth.debian.org
Sun Oct 27 17:40:59 UTC 2013


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 a67af235fca1340a493c53814d299de3442515a8
Merge: d06bc6a ac88cfc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 27 18:28:27 2013 +0100

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |  145 +++++
 PKG-INFO                                           |    4 +-
 astropy/__init__.py                                |   14 +-
 astropy/config/configuration.py                    |    2 +
 astropy/coordinates/angle_lextab.py                |    2 +-
 astropy/coordinates/angle_utilities.py             |   29 +-
 astropy/coordinates/angles.py                      |   22 +-
 astropy/coordinates/tests/test_angles.py           |    6 +
 astropy/coordinates/tests/test_api.py              |    7 +-
 astropy/coordinates/tests/test_formatting.py       |   49 ++
 astropy/io/ascii/basic.py                          |    2 +-
 astropy/io/ascii/core.py                           |   63 ---
 astropy/io/ascii/fixedwidth.py                     |   51 +-
 astropy/io/ascii/ipac.py                           |   72 ++-
 astropy/io/ascii/latex.py                          |    8 +-
 astropy/io/ascii/tests/test_read.py                |    5 +
 astropy/io/ascii/tests/test_write.py               |   31 +-
 astropy/io/ascii/ui.py                             |    2 +-
 astropy/io/fits/convenience.py                     |    7 +-
 astropy/io/fits/hdu/base.py                        |    9 +-
 astropy/io/fits/hdu/compressed.py                  |   15 +-
 astropy/io/fits/hdu/hdulist.py                     |    6 +-
 astropy/io/fits/hdu/image.py                       |   19 +-
 astropy/io/fits/hdu/table.py                       |  138 ++---
 astropy/io/fits/header.py                          |    4 +-
 astropy/io/fits/py3compat.py                       |    9 +-
 astropy/io/fits/src/compressionmodule.c            |   49 +-
 astropy/io/fits/tests/test_hdulist.py              |   80 +++
 astropy/io/fits/tests/test_image.py                |   16 +
 astropy/io/fits/tests/test_table.py                |   19 +
 astropy/io/votable/exceptions.py                   |   30 +-
 astropy/io/votable/table.py                        |    4 +-
 astropy/io/votable/tests/data/no_resource.txt      |    5 +
 astropy/io/votable/tests/data/no_resource.xml      |    6 +
 astropy/io/votable/tests/vo_test.py                |   37 ++
 astropy/io/votable/tree.py                         |    5 +-
 astropy/logger.py                                  |   45 +-
 astropy/nddata/convolution/boundary_extend.c       |    2 +-
 astropy/nddata/convolution/boundary_fill.c         |    2 +-
 astropy/nddata/convolution/boundary_none.c         |    2 +-
 astropy/nddata/convolution/boundary_wrap.c         |    2 +-
 astropy/nddata/convolution/convolve.py             |  137 ++---
 .../convolution/tests/test_convolve_kernels.py     |    3 -
 astropy/setup_helpers.py                           |    2 +
 astropy/sphinx/conf.py                             |    3 +
 astropy/table/pprint.py                            |    5 +-
 astropy/table/table.py                             |  104 +++-
 astropy/table/tests/test_pprint.py                 |    8 +
 astropy/table/tests/test_row.py                    |   22 +
 astropy/table/tests/test_table.py                  |  180 ++++++-
 astropy/tests/pytest_plugins.py                    |    8 +-
 astropy/tests/test_logger.py                       |   53 +-
 astropy/time/sofa_time.c                           |    2 +-
 astropy/units/core.py                              |   37 +-
 astropy/units/format/cds.py                        |   69 ++-
 astropy/units/format/console.py                    |    6 +-
 astropy/units/format/fits.py                       |    2 +-
 astropy/units/format/generic.py                    |    2 +-
 astropy/units/format/unicode_format.py             |   17 +-
 astropy/units/format/utils.py                      |   23 -
 astropy/units/format/vounit.py                     |    2 -
 astropy/units/physical.py                          |    2 +
 astropy/units/tests/test_format.py                 |   29 +-
 astropy/units/tests/test_physical.py               |   12 +
 astropy/units/tests/test_quantity.py               |    2 +-
 astropy/units/tests/test_units.py                  |   53 ++
 astropy/units/utils.py                             |   10 +-
 astropy/utils/console.py                           |   15 +-
 astropy/utils/data.py                              |   17 +-
 astropy/utils/misc.py                              |   11 +-
 astropy/utils/setup_package.py                     |    2 +
 astropy/utils/tests/data/test_package/__init__.py  |    4 +
 astropy/utils/tests/test_data.py                   |   25 +-
 astropy/utils/tests/test_misc.py                   |    4 +
 astropy/utils/tests/test_xml.py                    |   14 +
 astropy/utils/xml/src/iterparse.c                  |   44 +-
 astropy/utils/xml/writer.py                        |   51 +-
 astropy/version.py                                 |    6 +-
 astropy/wcs/setup_package.py                       |   12 +-
 astropy/wcs/tests/test_pickle.py                   |   29 +-
 astropy/wcs/tests/test_profiling.py                |   16 +-
 astropy/wcs/tests/test_wcs.py                      |   52 +-
 astropy/wcs/wcs.py                                 |   75 ++-
 distribute_setup.py                                |  564 --------------------
 docs/conf.py                                       |    3 +-
 docs/constants/index.rst                           |    2 +-
 docs/coordinates/designing.rst                     |    2 +-
 docs/coordinates/formatting.rst                    |    6 +-
 docs/coordinates/index.rst                         |    2 +-
 docs/coordinates/sgr-example.rst                   |    6 +-
 docs/cosmology/index.rst                           |   17 +-
 docs/credits.rst                                   |    2 +-
 docs/development/building_packaging.rst            |    6 +-
 docs/development/codeguide.rst                     |    2 +-
 docs/development/docguide.rst                      |    2 +
 docs/development/workflow/development_workflow.rst |   24 +-
 docs/development/workflow/git_links.inc            |    2 +-
 docs/install.rst                                   |   44 +-
 docs/io/ascii/index.rst                            |    2 +-
 docs/io/ascii/read.rst                             |    2 +-
 docs/io/ascii/write.rst                            |    2 +-
 docs/io/fits/api/verification.rst                  |    2 +-
 docs/io/fits/appendix/faq.rst                      |   51 +-
 docs/io/fits/appendix/history.rst                  |   35 +-
 docs/io/fits/index.rst                             |  122 +++--
 docs/io/fits/usage/examples.rst                    |    3 -
 docs/io/fits/usage/headers.rst                     |    8 +-
 docs/io/fits/usage/table.rst                       |    4 +-
 docs/io/fits/usage/verification.rst                |    2 +-
 docs/io/votable/index.rst                          |    2 +-
 docs/nddata/convolution.rst                        |    2 +-
 docs/stability.rst                                 |    4 +-
 docs/stats/index.rst                               |    2 +-
 docs/table/index.rst                               |    8 +-
 docs/time/index.rst                                |    2 +-
 docs/units/index.rst                               |    6 +-
 docs/utils/index.rst                               |    2 +-
 docs/whatsnew/0.2.rst                              |    2 +-
 ez_setup.py                                        |  264 +++++++++
 setup.py                                           |   20 +-
 setuptools_bootstrap.py                            |   34 ++
 121 files changed, 2201 insertions(+), 1259 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