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

Ole Streicher olebole at moszumanska.debian.org
Mon Jan 19 20:46:48 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 58d9ffc3bf633cc50faaa9d21336ac88e79ab63b
Merge: 9f66f24 7c7cea2
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jan 16 09:08:29 2015 +0100

    Merge branch 'upstream' into debian

 CHANGES.rst                                        |   146 +-
 PKG-INFO                                           |     4 +-
 README.rst                                         |     2 +-
 ah_bootstrap.py                                    |    16 +
 astropy/__init__.py                                |     8 +-
 astropy/convolution/boundary_extend.c              |  5255 ++++-----
 astropy/convolution/boundary_fill.c                |  5558 +++++-----
 astropy/convolution/boundary_none.c                |  5407 +++++-----
 astropy/convolution/boundary_wrap.c                |  5341 ++++-----
 astropy/coordinates/baseframe.py                   |    19 +-
 astropy/coordinates/builtin_frames.py              |    18 +-
 astropy/coordinates/distances.py                   |     9 +-
 astropy/coordinates/representation.py              |     2 +-
 astropy/coordinates/sky_coordinate.py              |    84 +-
 .../coordinates/tests/test_angular_separation.py   |     2 +-
 astropy/coordinates/tests/test_api_ape5.py         |     2 +-
 astropy/coordinates/tests/test_arrays.py           |     4 +-
 astropy/coordinates/tests/test_representation.py   |    10 +
 astropy/coordinates/tests/test_sky_coord.py        |    59 +
 astropy/coordinates/tests/test_transformations.py  |    18 +
 astropy/cosmology/core.py                          |    19 +-
 astropy/cosmology/funcs.py                         |     2 +-
 astropy/cosmology/tests/test_cosmology.py          |     3 +
 astropy/cython_version.py                          |     2 +-
 astropy/extern/setup_package.py                    |     2 +-
 astropy/extern/six.py                              |    48 +-
 astropy/io/ascii/setup_package.py                  |     1 +
 astropy/io/ascii/tests/test_compressed.py          |     9 +
 astropy/io/ascii/tests/test_read.py                |     7 +
 astropy/io/ascii/ui.py                             |    13 +
 astropy/io/fits/hdu/compressed.py                  |     7 +
 astropy/io/fits/hdu/hdulist.py                     |    10 +
 astropy/io/fits/setup_package.py                   |     1 +
 astropy/io/fits/src/compressionmodule.c            |    10 +-
 astropy/io/fits/tests/test_hdulist.py              |    19 +
 astropy/io/fits/util.py                            |    30 +-
 astropy/io/votable/setup_package.py                |     2 +
 astropy/modeling/core.py                           |    14 +
 astropy/modeling/functional_models.py              |    22 +-
 astropy/modeling/tests/test_input.py               |   218 +-
 astropy/modeling/tests/test_rotations.py           |     2 +-
 astropy/stats/funcs.py                             |    17 +-
 astropy/table/_np_utils.c                          |  4441 ++++----
 astropy/table/column.py                            |    14 +
 astropy/table/groups.py                            |     4 +-
 astropy/table/np_utils.py                          |    25 +-
 astropy/table/setup_package.py                     |     2 +
 astropy/table/table.py                             |     6 +-
 astropy/table/tests/test_column.py                 |    27 +
 astropy/table/tests/test_init_table.py             |    27 +
 astropy/table/tests/test_operations.py             |    19 +
 astropy/table/tests/test_table.py                  |     9 +
 astropy/tests/helper.py                            |     5 +-
 astropy/tests/pytest_plugins.py                    |    16 +-
 astropy/time/core.py                               |     5 +-
 astropy/time/erfa_time.c                           | 10727 ++++++++++---------
 astropy/units/core.py                              |    40 +-
 astropy/units/equivalencies.py                     |     5 +-
 astropy/units/quantity.py                          |   346 +-
 astropy/units/tests/test_equivalencies.py          |    56 +-
 astropy/units/tests/test_quantity.py               |    49 +
 astropy/units/tests/test_quantity_array_methods.py |    93 +-
 astropy/units/tests/test_units.py                  |    26 +-
 astropy/units/utils.py                             |    18 +-
 astropy/utils/data.py                              |    35 +-
 astropy/utils/metadata.py                          |     3 +-
 astropy/utils/misc.py                              |    28 +-
 astropy/utils/setup_package.py                     |     2 +
 astropy/utils/tests/test_data.py                   |    30 +-
 astropy/utils/tests/test_metadata.py               |    17 +-
 astropy/utils/tests/test_misc.py                   |    37 +
 astropy/utils/xml/setup_package.py                 |     2 +
 astropy/version.py                                 |    14 +-
 astropy/vo/samp/integrated_client.py               |    36 +-
 astropy/vo/samp/setup_package.py                   |     1 +
 astropy/vo/samp/tests/test_client.py               |    23 +
 astropy/wcs/src/wcslib_wrap.c                      |     2 +-
 astropy/wcs/tests/test_utils.py                    |     4 +-
 astropy/wcs/tests/test_wcs.py                      |    57 +-
 astropy/wcs/wcs.py                                 |     6 +
 astropy_helpers/.coveragerc                        |    21 -
 astropy_helpers/.travis.yml                        |    43 -
 astropy_helpers/CHANGES.rst                        |    61 -
 astropy_helpers/CONTRIBUTING.md                    |    20 -
 astropy_helpers/LICENSE.rst                        |    26 -
 astropy_helpers/MANIFEST.in                        |    10 -
 astropy_helpers/README.rst                         |    26 -
 astropy_helpers/ah_bootstrap.py                    |   748 --
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |    46 -
 .../astropy_helpers.egg-info/SOURCES.txt           |    67 -
 .../astropy_helpers.egg-info/dependency_links.txt  |     1 -
 .../astropy_helpers.egg-info/not-zip-safe          |     1 -
 .../astropy_helpers.egg-info/top_level.txt         |     1 -
 astropy_helpers/astropy_helpers/__init__.py        |     4 -
 astropy_helpers/astropy_helpers/compat/__init__.py |    12 -
 .../compat/_subprocess_py2/__init__.py             |    38 -
 .../astropy_helpers/compat/subprocess.py           |    19 -
 astropy_helpers/astropy_helpers/git_helpers.py     |   155 -
 astropy_helpers/astropy_helpers/setup_helpers.py   |  1526 ---
 astropy_helpers/astropy_helpers/sphinx/__init__.py |     6 -
 astropy_helpers/astropy_helpers/sphinx/conf.py     |   310 -
 .../astropy_helpers/sphinx/ext/__init__.py         |     3 -
 .../sphinx/ext/astropyautosummary.py               |    98 -
 .../astropy_helpers/sphinx/ext/automodapi.py       |   350 -
 .../astropy_helpers/sphinx/ext/automodsumm.py      |   581 -
 .../astropy_helpers/sphinx/ext/changelog_links.py  |    78 -
 .../astropy_helpers/sphinx/ext/comment_eater.py    |   169 -
 .../astropy_helpers/sphinx/ext/compiler_unparse.py |   865 --
 .../astropy_helpers/sphinx/ext/docscrape.py        |   531 -
 .../astropy_helpers/sphinx/ext/docscrape_sphinx.py |   274 -
 .../astropy_helpers/sphinx/ext/doctest.py          |    33 -
 .../astropy_helpers/sphinx/ext/edit_on_github.py   |   165 -
 .../astropy_helpers/sphinx/ext/numpydoc.py         |   187 -
 .../astropy_helpers/sphinx/ext/phantom_import.py   |   167 -
 .../astropy_helpers/sphinx/ext/smart_resolver.py   |    69 -
 .../sphinx/ext/templates/autosummary_core/base.rst |    10 -
 .../ext/templates/autosummary_core/class.rst       |    65 -
 .../ext/templates/autosummary_core/module.rst      |    41 -
 .../astropy_helpers/sphinx/ext/tests/__init__.py   |    70 -
 .../sphinx/ext/tests/test_automodapi.py            |   346 -
 .../sphinx/ext/tests/test_automodsumm.py           |   115 -
 .../sphinx/ext/tests/test_docscrape.py             |   762 --
 .../astropy_helpers/sphinx/ext/tests/test_utils.py |    34 -
 .../astropy_helpers/sphinx/ext/tocdepthfix.py      |    18 -
 .../astropy_helpers/sphinx/ext/traitsdoc.py        |   142 -
 .../astropy_helpers/sphinx/ext/utils.py            |    65 -
 .../astropy_helpers/sphinx/ext/viewcode.py         |   216 -
 .../astropy_helpers/sphinx/local/python3links.inv  |     7 -
 .../astropy_helpers/sphinx/local/python3links.txt  |    13 -
 .../astropy_helpers/sphinx/setup_package.py        |    10 -
 .../sphinx/themes/bootstrap-astropy/globaltoc.html |     3 -
 .../sphinx/themes/bootstrap-astropy/layout.html    |    96 -
 .../sphinx/themes/bootstrap-astropy/localtoc.html  |     3 -
 .../sphinx/themes/bootstrap-astropy/searchbox.html |     7 -
 .../static/astropy_linkout_20.png                  |   Bin 1725 -> 0 bytes
 .../bootstrap-astropy/static/astropy_logo.ico      |   Bin 1150 -> 0 bytes
 .../bootstrap-astropy/static/astropy_logo_32.png   |   Bin 1884 -> 0 bytes
 .../bootstrap-astropy/static/bootstrap-astropy.css |   585 -
 .../themes/bootstrap-astropy/static/copybutton.js  |    57 -
 .../themes/bootstrap-astropy/static/sidebar.js     |   160 -
 .../sphinx/themes/bootstrap-astropy/theme.conf     |    10 -
 astropy_helpers/astropy_helpers/src/__init__.py    |     0
 astropy_helpers/astropy_helpers/src/compiler.c     |   129 -
 .../astropy_helpers/src/setup_package.py           |     2 -
 astropy_helpers/astropy_helpers/test_helpers.py    |   207 -
 astropy_helpers/astropy_helpers/tests/__init__.py  |   172 -
 .../astropy_helpers/tests/test_ah_bootstrap.py     |   382 -
 .../astropy_helpers/tests/test_git_helpers.py      |    58 -
 .../astropy_helpers/tests/test_setup_helpers.py    |   119 -
 astropy_helpers/astropy_helpers/utils.py           |   162 -
 astropy_helpers/astropy_helpers/version.py         |   169 -
 astropy_helpers/astropy_helpers/version_helpers.py |   191 -
 .../astropy_helpers/__init__.py                    |     4 -
 .../astropy_helpers/compat/__init__.py             |    12 -
 .../compat/_subprocess_py2/__init__.py             |    38 -
 .../astropy_helpers/compat/subprocess.py           |    19 -
 .../astropy_helpers/git_helpers.py                 |   155 -
 .../astropy_helpers/setup_helpers.py               |  1526 ---
 .../astropy_helpers/sphinx/__init__.py             |     6 -
 .../astropy_helpers/sphinx/conf.py                 |   310 -
 .../astropy_helpers/sphinx/ext/__init__.py         |     3 -
 .../sphinx/ext/astropyautosummary.py               |    98 -
 .../astropy_helpers/sphinx/ext/automodapi.py       |   350 -
 .../astropy_helpers/sphinx/ext/automodsumm.py      |   581 -
 .../astropy_helpers/sphinx/ext/changelog_links.py  |    78 -
 .../astropy_helpers/sphinx/ext/comment_eater.py    |   169 -
 .../astropy_helpers/sphinx/ext/compiler_unparse.py |   865 --
 .../astropy_helpers/sphinx/ext/docscrape.py        |   531 -
 .../astropy_helpers/sphinx/ext/docscrape_sphinx.py |   274 -
 .../astropy_helpers/sphinx/ext/doctest.py          |    33 -
 .../astropy_helpers/sphinx/ext/edit_on_github.py   |   165 -
 .../astropy_helpers/sphinx/ext/numpydoc.py         |   187 -
 .../astropy_helpers/sphinx/ext/phantom_import.py   |   167 -
 .../astropy_helpers/sphinx/ext/smart_resolver.py   |    69 -
 .../sphinx/ext/templates/autosummary_core/base.rst |    10 -
 .../ext/templates/autosummary_core/class.rst       |    65 -
 .../ext/templates/autosummary_core/module.rst      |    41 -
 .../astropy_helpers/sphinx/ext/tests/__init__.py   |    70 -
 .../sphinx/ext/tests/test_automodapi.py            |   346 -
 .../sphinx/ext/tests/test_automodsumm.py           |   115 -
 .../sphinx/ext/tests/test_docscrape.py             |   762 --
 .../astropy_helpers/sphinx/ext/tests/test_utils.py |    34 -
 .../astropy_helpers/sphinx/ext/tocdepthfix.py      |    18 -
 .../astropy_helpers/sphinx/ext/traitsdoc.py        |   142 -
 .../astropy_helpers/sphinx/ext/utils.py            |    65 -
 .../astropy_helpers/sphinx/ext/viewcode.py         |   216 -
 .../astropy_helpers/sphinx/local/python3links.inv  |     7 -
 .../astropy_helpers/sphinx/setup_package.py        |    10 -
 .../sphinx/themes/bootstrap-astropy/globaltoc.html |     3 -
 .../sphinx/themes/bootstrap-astropy/layout.html    |    96 -
 .../sphinx/themes/bootstrap-astropy/localtoc.html  |     3 -
 .../sphinx/themes/bootstrap-astropy/searchbox.html |     7 -
 .../static/astropy_linkout_20.png                  |   Bin 1725 -> 0 bytes
 .../bootstrap-astropy/static/astropy_logo.ico      |   Bin 1150 -> 0 bytes
 .../bootstrap-astropy/static/astropy_logo_32.png   |   Bin 1884 -> 0 bytes
 .../bootstrap-astropy/static/bootstrap-astropy.css |   585 -
 .../themes/bootstrap-astropy/static/copybutton.js  |    57 -
 .../themes/bootstrap-astropy/static/sidebar.js     |   160 -
 .../sphinx/themes/bootstrap-astropy/theme.conf     |    10 -
 .../astropy_helpers/src/__init__.py                |     0
 .../astropy_helpers/src/compiler.c                 |   129 -
 .../astropy_helpers/src/setup_package.py           |     2 -
 .../astropy_helpers/test_helpers.py                |   207 -
 .../lib.linux-x86_64-2.7/astropy_helpers/utils.py  |   162 -
 .../astropy_helpers/version.py                     |   169 -
 .../astropy_helpers/version_helpers.py             |   191 -
 .../dist/astropy_helpers-0.4.2-py2.7.egg           |   Bin 210047 -> 0 bytes
 astropy_helpers/ez_setup.py                        |   382 -
 astropy_helpers/licenses/LICENSE_COPYBUTTON.rst    |    50 -
 astropy_helpers/licenses/LICENSE_NUMPYDOC.rst      |    94 -
 astropy_helpers/setup.cfg                          |     5 -
 astropy_helpers/setup.py                           |    50 -
 astropy_helpers/tox.ini                            |    12 -
 docs/_pkgtemplate.rst                              |     2 +-
 docs/coordinates/formatting.rst                    |     2 +-
 docs/coordinates/frames.rst                        |     2 +-
 docs/coordinates/index.rst                         |     4 +-
 docs/coordinates/representations.rst               |     7 +-
 docs/coordinates/skycoord.rst                      |   223 +-
 docs/coordinates/transforming.rst                  |    10 +-
 docs/cosmology/index.rst                           |     2 +-
 docs/development/docrules.rst                      |     2 +-
 docs/development/testguide.rst                     |    21 +-
 docs/development/workflow/development_workflow.rst |    14 +-
 docs/development/workflow/get_devel_version.rst    |     2 +-
 docs/development/workflow/maintainer_workflow.rst  |     4 +-
 docs/development/workflow/virtual_pythons.rst      |     4 +-
 docs/getting_started.rst                           |    22 +
 docs/install.rst                                   |     2 +-
 docs/io/ascii/base_classes.rst                     |     2 +-
 docs/io/ascii/fixed_width_gallery.rst              |     2 +-
 docs/io/fits/appendix/faq.rst                      |     4 +-
 docs/io/fits/appendix/header_transition.rst        |    12 +-
 docs/io/fits/appendix/history.rst                  |    12 +-
 docs/io/fits/index.rst                             |     2 +-
 docs/io/fits/usage/scripts.rst                     |     2 +
 docs/io/fits/usage/table.rst                       |     4 +-
 docs/io/fits/usage/unfamiliar.rst                  |     4 +-
 docs/known_issues.rst                              |    73 +-
 docs/modeling/algorithms.rst                       |     4 +-
 docs/nddata/nddata.rst                             |     2 +-
 docs/table/construct_table.rst                     |    23 +-
 docs/time/index.rst                                |     2 +-
 docs/units/decomposing_and_composing.rst           |     6 +-
 docs/units/format.rst                              |     2 +-
 docs/vo/samp/example_table_image.rst               |     2 +-
 docs/wcs/examples/from_file.py                     |     2 +-
 docs/wcs/index.rst                                 |     2 +
 setup.py                                           |     2 +-
 249 files changed, 21365 insertions(+), 38853 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