[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 c4d66329425fb5defc167a75a9eb5fae6457e7a3
Merge: b5aac45 dcfbe6e
Author: Ole Streicher <ole at aip.de>
Date:   Thu Jun 23 09:44:20 2016 +0200

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |  23 +
 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 ++++++------
 astropy/io/ascii/cparser.c                         | 384 ++++++------
 astropy/io/fits/hdu/base.py                        |   6 +-
 astropy/io/fits/hdu/compressed.py                  |   3 +-
 astropy/io/fits/tests/test_image.py                |  31 +
 astropy/modeling/src/projections.c                 | 684 ++++++++++-----------
 .../lombscargle/implementations/cython_impl.c      | 382 ++++++------
 astropy/table/_np_utils.c                          | 384 ++++++------
 astropy/units/__init__.py                          |   1 +
 astropy/units/function/logarithmic.py              |  36 +-
 astropy/units/function/magnitude_zero_points.py    |  70 +++
 astropy/units/tests/test_logarithmic.py            |  16 +
 astropy/version.py                                 |  10 +-
 .../astropy_helpers.egg-info/SOURCES.txt           |   1 +
 astropy_helpers/astropy_helpers.egg-info/pbr.json  |   1 +
 astropy_helpers/astropy_helpers/version.py         |   4 +-
 docs/units/logarithmic_units.rst                   |  36 +-
 setup.py                                           |   2 +-
 23 files changed, 1876 insertions(+), 1738 deletions(-)

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