[Debian-astro-commits] [python-astropy] 01/02: Merge branch 'upstream' into experimental

[Ole Streicher]

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

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

commit 2e95c7f87ab57b68a5d1e5ec00df500c0096b69e
Merge: 71e620a 6fb7d3c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 8 09:28:56 2015 +0100

    Merge branch 'upstream' into experimental

 CHANGES.rst                                        |   23 +-
 PKG-INFO                                           |    4 +-
 astropy/__init__.py                                |   56 +-
 astropy/_erfa/core.py                              |    8 +-
 astropy/convolution/boundary_extend.c              |  400 ++---
 astropy/convolution/boundary_fill.c                |  400 ++---
 astropy/convolution/boundary_none.c                |  400 ++---
 astropy/convolution/boundary_wrap.c                |  400 ++---
 .../builtin_frames/ecliptic_transforms.py          |   19 +-
 .../coordinates/tests/accuracy/test_ecliptic.py    |   48 +
 astropy/coordinates/tests/test_name_resolve.py     |   11 +-
 astropy/coordinates/tests/test_transformations.py  |    4 +-
 astropy/cosmology/scalar_inv_efuncs.c              |   58 +-
 astropy/cython_version.py                          |    2 +-
 astropy/io/ascii/cparser.c                         | 1695 ++++++++++----------
 astropy/io/ascii/cparser.pyx                       |    6 +-
 astropy/io/ascii/tests/test_write.py               |   12 +
 astropy/modeling/src/projections.c                 |  636 ++++----
 astropy/stats/funcs.py                             |    2 +-
 astropy/table/_column_mixins.c                     |    4 +-
 astropy/table/_np_utils.c                          |  396 ++---
 astropy/table/table.py                             |    9 +-
 astropy/units/cgs.py                               |    2 +-
 astropy/units/physical.py                          |    6 +-
 astropy/version.py                                 |    8 +-
 astropy/visualization/tests/test_histogram.py      |   20 +-
 astropy/wcs/tests/test_wcsprm.py                   |   14 +-
 astropy_helpers/.travis.yml                        |   29 +-
 astropy_helpers/CHANGES.rst                        |   16 +-
 astropy_helpers/appveyor.yml                       |   21 +-
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |    9 +-
 .../astropy_helpers.egg-info/SOURCES.txt           |   12 +-
 astropy_helpers/astropy_helpers/commands/_dummy.py |   81 +
 .../astropy_helpers/commands/build_ext.py          |  195 ++-
 .../astropy_helpers/commands/build_sphinx.py       |   25 +-
 astropy_helpers/astropy_helpers/commands/test.py   |   41 +-
 astropy_helpers/astropy_helpers/setup_helpers.py   |  154 +-
 .../sphinx/ext/astropyautosummary.py               |    9 +
 .../astropy_helpers/tests/test_setup_helpers.py    |   33 +-
 astropy_helpers/astropy_helpers/version.py         |   76 +-
 .../appveyor/install-miniconda.ps1                 |   71 -
 .../appveyor/windows_sdk.cmd                       |   47 -
 .../travis/install_conda_linux.sh                  |    7 -
 .../travis/install_conda_osx.sh                    |    7 -
 .../travis/install_graphviz_linux.sh               |    4 -
 .../travis/install_graphviz_osx.sh                 |    4 -
 astropy_helpers/setup.py                           |    2 +-
 docs/conf.py                                       |    1 +
 docs/credits.rst                                   |   14 +-
 docs/whatsnew/1.1.rst                              |   31 +-
 setup.py                                           |    8 +-
 51 files changed, 2886 insertions(+), 2654 deletions(-)

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