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

Ole Streicher olebole at moszumanska.debian.org
Tue Oct 6 11:28:38 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 a548b8d8f3b9d055f698b8377aaee00ee8a8226f
Merge: 9898d3d 91538aa
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Oct 6 13:25:55 2015 +0200

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |   108 +-
 PKG-INFO                                           |     4 +-
 ah_bootstrap.py                                    |     2 +-
 astropy/__init__.py                                |    17 +
 astropy/_erfa/core.c                               |  5146 ++--
 astropy/_erfa/core.c.templ                         |     9 +-
 astropy/_erfa/core.py                              | 25068 +++++++++----------
 astropy/_erfa/erfa_generator.py                    |    14 +-
 astropy/constants/constant.py                      |     6 +-
 astropy/coordinates/baseframe.py                   |    77 +-
 astropy/coordinates/matching.py                    |     7 +-
 astropy/coordinates/sky_coordinate.py              |    13 +-
 astropy/coordinates/tests/test_regression.py       |    19 +-
 astropy/coordinates/tests/test_sky_coord.py        |    18 +-
 astropy/coordinates/tests/test_transformations.py  |    30 +-
 astropy/coordinates/transformations.py             |    12 +-
 astropy/cosmology/core.py                          |     6 +-
 astropy/extern/pytest.py                           |  6680 ++---
 astropy/io/ascii/tests/test_read.py                |    39 +
 astropy/io/ascii/ui.py                             |    16 +
 astropy/io/fits/diff.py                            |     6 +-
 astropy/io/fits/file.py                            |    91 +-
 astropy/io/fits/hdu/base.py                        |    43 +-
 astropy/io/fits/hdu/compressed.py                  |     5 +-
 astropy/io/fits/header.py                          |    10 +-
 astropy/io/fits/tests/test_core.py                 |    74 +-
 astropy/io/fits/tests/test_header.py               |    36 +
 astropy/modeling/core.py                           |    63 +-
 astropy/modeling/functional_models.py              |    12 +-
 astropy/modeling/parameters.py                     |     9 +-
 astropy/modeling/polynomial.py                     |    62 +-
 astropy/modeling/tests/test_core.py                |    41 +-
 astropy/modeling/tests/test_input.py               |    60 +-
 astropy/modeling/tests/test_parameters.py          |    56 +-
 astropy/modeling/utils.py                          |    30 +
 astropy/nddata/compat.py                           |    11 +-
 astropy/nddata/decorators.py                       |    21 +-
 astropy/nddata/nddata.py                           |     4 +-
 astropy/nddata/tests/test_compat.py                |    29 +
 astropy/nddata/tests/test_decorators.py            |     8 +-
 astropy/table/__init__.py                          |     1 +
 astropy/table/column.py                            |     7 +-
 astropy/table/jsviewer.py                          |    20 +-
 astropy/table/operations.py                        |     2 +-
 astropy/table/table.py                             |    28 +-
 astropy/table/tests/test_masked.py                 |    17 +
 astropy/table/tests/test_operations.py             |     7 +
 astropy/table/tests/test_pickle.py                 |     4 +
 astropy/tests/coveragerc                           |     1 +
 astropy/tests/helper.py                            |    38 +-
 astropy/tests/pytest_plugins.py                    |     6 +-
 astropy/tests/test_logger.py                       |     4 +-
 astropy/utils/console.py                           |    25 +-
 astropy/utils/data.py                              |     5 +-
 astropy/utils/introspection.py                     |     8 +-
 astropy/utils/tests/test_data.py                   |    26 +-
 astropy/utils/tests/test_decorators.py             |    48 +-
 astropy/utils/tests/test_odict.py                  |     2 +-
 astropy/version.py                                 |    10 +-
 astropy/visualization/mpl_normalize.py             |     3 +
 astropy/visualization/mpl_style.py                 |     2 +-
 astropy/visualization/tests/test_norm.py           |    18 +
 astropy/vo/client/tests/test_conesearch.py         |     4 +-
 astropy/vo/validator/tstquery.py                   |    34 +-
 astropy_helpers/.cache/v/cache/lastfailed          |     1 +
 astropy_helpers/.coverage                          |   Bin 0 -> 13497 bytes
 astropy_helpers/CHANGES.rst                        |    32 +
 astropy_helpers/ah_bootstrap.py                    |     2 +-
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |     4 +-
 .../astropy_helpers.egg-info/SOURCES.txt           |     3 +-
 astropy_helpers/astropy_helpers/__init__.pyo       |   Bin 551 -> 0 bytes
 .../__pycache__/__init__.cpython-34.pyo            |   Bin 501 -> 0 bytes
 .../__pycache__/distutils_helpers.cpython-34.pyo   |   Bin 3932 -> 0 bytes
 .../__pycache__/git_helpers.cpython-34.pyo         |   Bin 3022 -> 0 bytes
 .../__pycache__/setup_helpers.cpython-34.pyo       |   Bin 16389 -> 0 bytes
 .../__pycache__/test_helpers.cpython-34.pyo        |   Bin 6718 -> 0 bytes
 .../__pycache__/utils.cpython-34.pyo               |   Bin 10969 -> 0 bytes
 .../__pycache__/version.cpython-34.pyo             |   Bin 678 -> 0 bytes
 .../__pycache__/version_helpers.cpython-34.pyo     |   Bin 5474 -> 0 bytes
 .../astropy_helpers/commands/__init__.pyo          |   Bin 176 -> 0 bytes
 .../commands/__pycache__/__init__.cpython-34.pyo   |   Bin 172 -> 0 bytes
 .../commands/__pycache__/build_ext.cpython-34.pyo  |   Bin 3910 -> 0 bytes
 .../commands/__pycache__/build_py.cpython-34.pyo   |   Bin 1394 -> 0 bytes
 .../__pycache__/build_sphinx.cpython-34.pyo        |   Bin 5679 -> 0 bytes
 .../commands/__pycache__/install.cpython-34.pyo    |   Bin 826 -> 0 bytes
 .../__pycache__/install_lib.cpython-34.pyo         |   Bin 847 -> 0 bytes
 .../commands/__pycache__/register.cpython-34.pyo   |   Bin 1315 -> 0 bytes
 .../astropy_helpers/commands/build_ext.py          |   206 +-
 .../astropy_helpers/commands/build_ext.pyo         |   Bin 4529 -> 0 bytes
 .../astropy_helpers/commands/build_py.pyo          |   Bin 1740 -> 0 bytes
 .../astropy_helpers/commands/build_sphinx.pyo      |   Bin 6933 -> 0 bytes
 .../astropy_helpers/commands/install.pyo           |   Bin 991 -> 0 bytes
 .../astropy_helpers/commands/install_lib.pyo       |   Bin 1017 -> 0 bytes
 .../astropy_helpers/commands/register.pyo          |   Bin 1712 -> 0 bytes
 .../astropy_helpers/compat/__init__.pyo            |   Bin 882 -> 0 bytes
 .../compat/__pycache__/__init__.cpython-34.pyo     |   Bin 807 -> 0 bytes
 .../astropy_helpers/distutils_helpers.pyo          |   Bin 5164 -> 0 bytes
 astropy_helpers/astropy_helpers/git_helpers.pyo    |   Bin 3630 -> 0 bytes
 astropy_helpers/astropy_helpers/setup_helpers.py   |     8 +-
 astropy_helpers/astropy_helpers/setup_helpers.pyo  |   Bin 19637 -> 0 bytes
 .../bootstrap-astropy/static/bootstrap-astropy.css |     1 -
 astropy_helpers/astropy_helpers/test_helpers.py    |    26 +-
 astropy_helpers/astropy_helpers/test_helpers.pyo   |   Bin 9186 -> 0 bytes
 .../astropy_helpers/tests/test_setup_helpers.py    |   267 +-
 astropy_helpers/astropy_helpers/utils.pyo          |   Bin 13631 -> 0 bytes
 astropy_helpers/astropy_helpers/version.py         |   206 +-
 astropy_helpers/astropy_helpers/version.pyo        |   Bin 768 -> 0 bytes
 .../astropy_helpers/version_helpers.pyo            |   Bin 6190 -> 0 bytes
 astropy_helpers/setup.py                           |     2 +-
 docs/constants/index.rst                           |     4 +-
 docs/development/scripts.rst                       |     2 +-
 docs/install.rst                                   |     2 +-
 docs/io/unified.rst                                |     1 +
 docs/logging.rst                                   |     8 +-
 docs/table/masking.rst                             |    44 +-
 docs/table/operations.rst                          |     5 +-
 docs/warnings.rst                                  |    33 +-
 ez_setup.py                                        |   403 +-
 setup.py                                           |     2 +-
 119 files changed, 20498 insertions(+), 19046 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-astro-commits mailing list