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

Ole Streicher olebole at moszumanska.debian.org
Thu Feb 12 09:18:10 UTC 2015


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

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

commit 5c61f7fc0f0762f3d986b422975e73ddd6863170
Merge: 6a867b4 f8d338b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Feb 12 09:21:45 2015 +0100

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |    46 +-
 PKG-INFO                                           |     4 +-
 ah_bootstrap.py                                    |    46 +-
 astropy/__init__.py                                |    11 +-
 astropy/_erfa/core.c                               |  9725 +++++++-------
 astropy/_erfa/core.py                              |   332 +-
 astropy/_erfa/core.py.templ                        |    10 +-
 astropy/_erfa/core.pyx                             |     1 -
 astropy/_erfa/core.pyx.templ                       |     1 -
 astropy/_erfa/setup_package.py                     |    25 +-
 astropy/config/configuration.py                    |     9 +-
 astropy/convolution/boundary_extend.c              |  2617 ++--
 astropy/convolution/boundary_fill.c                |  2894 +++--
 astropy/convolution/boundary_none.c                |  2761 ++--
 astropy/convolution/boundary_wrap.c                |  2617 ++--
 astropy/convolution/tests/test_convolve_fft.py     |     2 +-
 astropy/coordinates/baseframe.py                   |    13 +-
 .../coordinates/builtin_frames/galactocentric.py   |    21 +-
 astropy/coordinates/matching.py                    |    38 +-
 astropy/coordinates/representation.py              |    62 +-
 astropy/coordinates/sky_coordinate.py              |    60 +-
 .../coordinates/tests/accuracy/test_altaz_icrs.py  |    13 +-
 astropy/coordinates/tests/test_api_ape5.py         |    12 +-
 astropy/coordinates/tests/test_earth.py            |     6 +-
 astropy/coordinates/tests/test_frames.py           |    54 +-
 astropy/coordinates/tests/test_matching.py         |    28 +
 astropy/coordinates/tests/test_representation.py   |     8 +-
 astropy/coordinates/tests/test_sky_coord.py        |    16 +-
 astropy/cython_version.py                          |     2 +-
 astropy/io/ascii/basic.py                          |    18 +-
 astropy/io/ascii/cds.py                            |    11 +-
 astropy/io/ascii/core.py                           |   183 +-
 astropy/io/ascii/cparser.c                         | 12515 ++++++++-----------
 astropy/io/ascii/cparser.pyx                       |    11 +-
 astropy/io/ascii/daophot.py                        |     7 +-
 astropy/io/ascii/ecsv.py                           |    10 +-
 astropy/io/ascii/fixedwidth.py                     |    82 +-
 astropy/io/ascii/ipac.py                           |    25 +-
 astropy/io/ascii/latex.py                          |    32 +-
 astropy/io/ascii/sextractor.py                     |    10 +-
 astropy/io/ascii/src/tokenizer.c                   |     4 +-
 astropy/io/ascii/tests/test_c_reader.py            |    10 +
 astropy/io/ascii/tests/test_ecsv.py                |     3 +-
 astropy/io/ascii/ui.py                             |   220 +-
 astropy/io/fits/column.py                          |    29 +-
 astropy/io/fits/fitsrec.py                         |   131 +-
 astropy/io/fits/tests/test_table.py                |    36 +
 astropy/io/fits/util.py                            |     3 +-
 astropy/io/votable/tree.py                         |    12 +-
 astropy/modeling/functional_models.py              |     2 +-
 astropy/modeling/tests/test_models.py              |     2 +-
 astropy/nddata/nddata.py                           |     4 +-
 astropy/nddata/tests/test_nddata.py                |    29 +
 astropy/table/_np_utils.c                          |  1527 ++-
 astropy/table/column.py                            |     8 +-
 astropy/table/pprint.py                            |    15 +-
 astropy/table/row.py                               |    16 +-
 astropy/table/table.py                             |    14 +-
 astropy/table/tests/test_column.py                 |     7 +-
 astropy/table/tests/test_item_access.py            |    14 +
 astropy/table/tests/test_pprint.py                 |     8 +
 astropy/table/tests/test_row.py                    |     8 +-
 astropy/tests/helper.py                            |    12 +
 astropy/time/core.py                               |    17 +-
 astropy/time/tests/test_basic.py                   |     3 +
 astropy/units/core.py                              |    28 +-
 astropy/units/equivalencies.py                     |    14 +-
 astropy/units/quantity.py                          |    12 +-
 astropy/units/tests/test_quantity.py               |    10 +-
 astropy/units/tests/test_quantity_array_methods.py |    13 +-
 astropy/units/tests/test_units.py                  |     8 +-
 astropy/utils/__init__.py                          |     3 +-
 astropy/utils/compat/__init__.py                   |     4 +-
 astropy/utils/compat/numpycompat.py                |    26 +-
 astropy/utils/introspection.py                     |   132 +-
 astropy/version.py                                 |   158 +-
 astropy/visualization/mpl_normalize.py             |     8 +-
 astropy/vo/samp/hub.py                             |     2 +-
 astropy/wcs/setup_package.py                       |     3 +
 astropy/wcs/src/wcslib_wrap.c                      |     4 -
 astropy/wcs/tests/test_utils.py                    |    19 +-
 astropy/wcs/tests/test_wcsprm.py                   |     9 +-
 astropy/wcs/utils.py                               |    69 +-
 astropy_helpers/CHANGES.rst                        |    19 +-
 astropy_helpers/ah_bootstrap.py                    |    46 +-
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |     9 +-
 .../astropy_helpers/commands/build_sphinx.py       |     2 +-
 .../astropy_helpers/distutils_helpers.py           |     2 +-
 astropy_helpers/astropy_helpers/git_helpers.py     |    47 +-
 astropy_helpers/astropy_helpers/setup_helpers.py   |     6 +-
 .../astropy_helpers/sphinx/ext/automodsumm.py      |     2 +-
 .../astropy_helpers/sphinx/ext/viewcode.py         |     2 +-
 astropy_helpers/astropy_helpers/tests/__init__.py  |     2 +-
 .../astropy_helpers/tests/test_ah_bootstrap.py     |     2 +-
 .../astropy_helpers/tests/test_git_helpers.py      |    47 +
 astropy_helpers/astropy_helpers/utils.py           |     5 +-
 astropy_helpers/astropy_helpers/version.py         |    76 +-
 astropy_helpers/astropy_helpers/version_helpers.py |   170 +-
 astropy_helpers/setup.py                           |     9 +-
 astropy_helpers/tox.ini                            |     9 +-
 docs/coordinates/angles.rst                        |     5 +-
 docs/coordinates/frames.rst                        |    33 +-
 docs/coordinates/index.rst                         |    36 +-
 docs/coordinates/matchsep.rst                      |    61 +-
 docs/coordinates/observing-example.rst             |    53 +-
 docs/coordinates/representations.rst               |    17 +-
 docs/coordinates/skycoord.rst                      |    56 +-
 docs/coordinates/transforming.rst                  |    24 +-
 docs/credits.rst                                   |    37 +-
 docs/development/affiliated-packages.rst           |    14 +-
 docs/development/building.rst                      |     2 +-
 docs/development/workflow/maintainer_workflow.rst  |     4 +-
 docs/getting_started.rst                           |     3 +-
 docs/install.rst                                   |     4 +-
 docs/io/ascii/index.rst                            |    13 +-
 docs/io/fits/appendix/history.rst                  |    12 +-
 docs/modeling/compound-models.rst                  |    17 +-
 docs/modeling/index.rst                            |     8 +-
 docs/modeling/models.rst                           |    66 +-
 docs/nddata/index.rst                              |     4 +-
 docs/nitpick-exceptions                            |     5 +-
 docs/stability.rst                                 |    49 +-
 docs/table/access_table.rst                        |     1 +
 docs/table/mixin_columns.rst                       |    22 +
 docs/units/conversion.rst                          |    20 +-
 docs/units/equivalencies.rst                       |    48 +-
 docs/visualization/normalization.rst               |     8 +-
 docs/vo/samp/example_clients.rst                   |    17 +-
 docs/whatsnew/1.0.rst                              |   169 +-
 setup.py                                           |    11 +-
 130 files changed, 19571 insertions(+), 18697 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