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

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository python-astropy.

commit 250153236f8a61cf8bf16db65b1fb0331433889f
Merge: 45d4167 b19b38a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Mar 13 13:37:26 2015 +0100

    Merge branch 'upstream' into debian

 CHANGES.rst                                       |   237 +
 PKG-INFO                                          |     4 +-
 ah_bootstrap.py                                   |    82 +-
 astropy/_erfa/core.c                              | 43501 ++------------------
 astropy/_erfa/core.c.templ                        |   136 +
 astropy/_erfa/core.py                             | 24685 ++++++-----
 astropy/_erfa/core.py.templ                       |    15 +-
 astropy/_erfa/core.pyx                            |  3960 --
 astropy/_erfa/core.pyx.templ                      |    90 -
 astropy/_erfa/erfa_generator.py                   |    30 +-
 astropy/_erfa/setup_package.py                    |    12 +-
 astropy/config/configuration.py                   |    19 +-
 astropy/constants/__init__.py                     |     4 +-
 astropy/constants/constant.py                     |    41 +-
 astropy/constants/tests/test_constant.py          |    37 +
 astropy/convolution/boundary_extend.c             |   348 +-
 astropy/convolution/boundary_fill.c               |   348 +-
 astropy/convolution/boundary_none.c               |   348 +-
 astropy/convolution/boundary_wrap.c               |   348 +-
 astropy/coordinates/baseframe.py                  |     2 +-
 astropy/io/ascii/basic.py                         |    17 +
 astropy/io/ascii/cparser.c                        |   374 +-
 astropy/io/ascii/cparser.pyx                      |     2 +-
 astropy/io/ascii/fastbasic.py                     |    19 +-
 astropy/io/ascii/src/tokenizer.c                  |   228 +-
 astropy/io/ascii/src/tokenizer.h                  |     8 +
 astropy/io/ascii/tests/test_c_reader.py           |   224 +-
 astropy/io/ascii/tests/test_read.py               |    30 +-
 astropy/io/ascii/tests/test_write.py              |    37 +-
 astropy/io/ascii/ui.py                            |    19 +-
 astropy/modeling/core.py                          |    31 +-
 astropy/modeling/parameters.py                    |    55 +-
 astropy/modeling/tests/test_compound.py           |    75 +
 astropy/modeling/utils.py                         |   141 +-
 astropy/nddata/compat.py                          |   189 +-
 astropy/nddata/tests/test_compat.py               |    96 +
 astropy/nddata/tests/test_nddata.py               |    15 -
 astropy/table/_np_utils.c                         |   348 +-
 astropy/table/operations.py                       |     2 +-
 astropy/table/tests/test_operations.py            |     4 +-
 astropy/time/core.py                              |    12 +-
 astropy/time/tests/test_basic.py                  |    34 +-
 astropy/units/core.py                             |     6 +-
 astropy/version.py                                |    10 +-
 astropy_helpers/CHANGES.rst                       |    31 +-
 astropy_helpers/ah_bootstrap.py                   |    82 +-
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO |     4 +-
 astropy_helpers/astropy_helpers/__init__.py       |    29 +
 astropy_helpers/astropy_helpers/version.py        |    10 +-
 astropy_helpers/setup.py                          |     2 +-
 docs/coordinates/angles.rst                       |     2 +
 docs/coordinates/index.rst                        |   129 +-
 docs/nddata/index.rst                             |     4 +-
 setup.py                                          |     2 +-
 54 files changed, 19367 insertions(+), 57151 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git