[Debian-astro-commits] [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 9cc3d0234b355f95c484e97a1525010197bc0f34
Merge: 2a8e7c5 6865d6e
Author: Ole Streicher <ole at aip.de>
Date:   Mon Jun 20 15:08:26 2016 +0200

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |  67 ++-
 PKG-INFO                                           |   4 +-
 astropy/convolution/boundary_extend.c              | 384 ++++++------
 astropy/convolution/boundary_fill.c                | 384 ++++++------
 astropy/convolution/boundary_none.c                | 384 ++++++------
 astropy/convolution/boundary_wrap.c                | 384 ++++++------
 .../builtin_frames/cirs_observed_transforms.py     |   2 +-
 .../builtin_frames/ecliptic_transforms.py          |  23 +-
 astropy/coordinates/builtin_frames/gcrs.py         |   2 +-
 astropy/coordinates/builtin_frames/hcrs.py         |   2 +-
 .../builtin_frames/icrs_cirs_transforms.py         |   4 +-
 astropy/coordinates/earth.py                       |   2 +-
 astropy/coordinates/solar_system.py                |   2 +
 astropy/coordinates/tests/test_earth.py            |   9 +
 .../tests/test_intermediate_transformations.py     |   2 +-
 astropy/coordinates/tests/test_name_resolve.py     |   2 +-
 astropy/coordinates/tests/test_regression.py       |  36 +-
 astropy/coordinates/tests/test_solar_system.py     |  10 +
 astropy/cosmology/tests/test_cosmology.py          |   2 +-
 astropy/io/ascii/cparser.c                         | 384 ++++++------
 astropy/io/ascii/rst.py                            |   2 +-
 astropy/io/ascii/tests/test_html.py                |   6 +-
 astropy/io/ascii/tests/test_write.py               |  14 +-
 astropy/io/fits/convenience.py                     | 112 ++--
 astropy/io/fits/fitsrec.py                         |   2 +-
 astropy/io/fits/hdu/image.py                       |   2 +-
 astropy/io/fits/hdu/table.py                       |   8 +-
 astropy/io/fits/tests/test_convenience.py          |  16 +
 astropy/io/fits/tests/test_diff.py                 |   2 +-
 astropy/io/fits/tests/test_image.py                |   9 +
 astropy/io/fits/tests/test_table.py                |   4 +-
 astropy/io/fits/util.py                            |  10 +-
 astropy/io/tests/test_registry.py                  |   4 +-
 astropy/modeling/src/projections.c                 | 612 +++++++++----------
 astropy/nddata/mixins/tests/test_ndarithmetic.py   |   8 +-
 astropy/nddata/mixins/tests/test_ndslicing.py      |   2 +-
 astropy/nddata/nddata.py                           |   4 +-
 astropy/nddata/nddata_base.py                      |   2 +-
 astropy/nddata/nduncertainty.py                    |  10 +-
 astropy/nddata/tests/test_nddata.py                |   6 +-
 astropy/stats/bayesian_blocks.py                   |   2 +-
 astropy/stats/circstats.py                         |   4 +-
 astropy/stats/info_theory.py                       |   8 +-
 astropy/stats/lombscargle/core.py                  |   4 +-
 .../stats/lombscargle/implementations/chi2_impl.py |   2 +-
 .../lombscargle/implementations/cython_impl.c      | 384 ++++++------
 .../lombscargle/implementations/cython_impl.pyx    |   4 +-
 .../lombscargle/implementations/fastchi2_impl.py   |   4 +-
 astropy/stats/lombscargle/implementations/main.py  |   4 +-
 .../stats/lombscargle/implementations/slow_impl.py |   4 +-
 astropy/stats/lombscargle/implementations/utils.py |   2 +-
 astropy/table/_np_utils.c                          | 384 ++++++------
 astropy/table/table.py                             |   6 +-
 astropy/time/tests/test_basic.py                   |   2 +-
 astropy/units/core.py                              |  29 +-
 astropy/units/decorators.py                        |   2 +-
 astropy/units/function/core.py                     |   6 +-
 astropy/units/function/logarithmic.py              |   2 +-
 astropy/units/quantity.py                          |  12 +-
 astropy/units/si.py                                |   2 +-
 .../units/tests/py3_test_quantity_annotations.py   |   4 +-
 astropy/units/tests/test_equivalencies.py          |  14 +
 astropy/units/tests/test_quantity_array_methods.py |   7 +-
 astropy/units/tests/test_quantity_decorator.py     |   4 +-
 astropy/units/utils.py                             |   2 +-
 astropy/utils/compat/misc.py                       |  10 +-
 astropy/utils/compat/numpycompat.py                |   3 +-
 astropy/utils/iers/data/eopc04_IAU2000.62-now      | 665 +++++++++++----------
 astropy/utils/iers/iers.py                         |  20 +-
 astropy/utils/metadata.py                          |   2 +-
 astropy/utils/misc.py                              |   2 +-
 astropy/utils/tests/test_decorators.py             |   2 +-
 astropy/version.py                                 |   8 +-
 astropy/wcs/tests/test_wcs.py                      |   2 +-
 astropy/wcs/wcs.py                                 |  18 +-
 astropy_helpers/CHANGES.rst                        |   4 +-
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |   8 +-
 .../astropy_helpers.egg-info/SOURCES.txt           |   9 +-
 astropy_helpers/astropy_helpers.egg-info/pbr.json  |   1 -
 astropy_helpers/astropy_helpers/version.py         | 202 +------
 docs/coordinates/matchsep.rst                      |  16 +
 docs/coordinates/remote_methods.rst                |   2 +-
 docs/coordinates/solarsystem.rst                   |   6 +-
 docs/credits.rst                                   |  40 +-
 docs/development/ccython.rst                       |   2 +-
 docs/development/releasing.rst                     |  39 +-
 docs/io/fits/index.rst                             |   2 +-
 docs/modeling/bounding-boxes.rst                   |   2 +-
 docs/nddata/index.rst                              |   2 +-
 docs/nddata/nddata.rst                             |   4 +-
 docs/nddata/subclassing.rst                        |   8 +-
 docs/stats/lombscargle.rst                         |   2 +-
 docs/units/equivalencies.rst                       |   8 +-
 docs/units/quantity.rst                            |   7 +-
 docs/utils/iers.rst                                |  15 +-
 docs/whatsnew/1.2.rst                              | 191 +++---
 pip-requirements                                   |   2 +-
 setup.py                                           |   2 +-
 98 files changed, 2631 insertions(+), 2497 deletions(-)

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