[Debian-astro-commits] [python-astropy] 01/02: Merge branch 'upstream' into debian
Ole Streicher
olebole at moszumanska.debian.org
Sat Jan 9 09:41:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository python-astropy.
commit 8e845838f0392e1d17861bf646949927965f5e14
Merge: 39eb582 29cea21
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jan 9 10:17:07 2016 +0100
Merge branch 'upstream' into debian
CHANGES.rst | 190 +++--
PKG-INFO | 4 +-
astropy/analytic_functions/blackbody.py | 27 +-
astropy/analytic_functions/tests/test_blackbody.py | 4 -
astropy/convolution/boundary_extend.c | 396 +++++-----
astropy/convolution/boundary_fill.c | 396 +++++-----
astropy/convolution/boundary_none.c | 396 +++++-----
astropy/convolution/boundary_wrap.c | 396 +++++-----
astropy/cosmology/scalar_inv_efuncs.c | 54 +-
astropy/io/ascii/basic.py | 100 ++-
astropy/io/ascii/cparser.c | 398 +++++-----
astropy/io/ascii/daophot.py | 30 +-
astropy/io/fits/column.py | 4 +-
astropy/io/fits/fitsrec.py | 8 +-
astropy/io/fits/tests/test_connect.py | 15 +
astropy/io/fits/tests/test_table.py | 43 +
astropy/io/registry.py | 20 +-
astropy/table/_np_utils.c | 392 ++++-----
astropy/units/quantity.py | 13 +-
astropy/units/tests/test_quantity_array_methods.py | 1 -
astropy/utils/console.py | 4 +
astropy/utils/misc.py | 30 +-
astropy/utils/tests/test_console.py | 7 +-
astropy/version.py | 10 +-
astropy/wcs/wcs.py | 26 +-
astropy_helpers/CHANGES.rst | 7 +
astropy_helpers/astropy_helpers.egg-info/PKG-INFO | 9 +-
.../astropy_helpers.egg-info/SOURCES.txt | 12 +-
.../astropy_helpers/commands/build_ext.py | 20 +-
astropy_helpers/astropy_helpers/version.py | 204 +----
.../astropy_helpers/__init__.py | 52 --
.../astropy_helpers/commands/__init__.py | 0
.../astropy_helpers/commands/_dummy.py | 81 --
.../astropy_helpers/commands/_test_compat.py | 307 -------
.../astropy_helpers/commands/build_ext.py | 457 -----------
.../astropy_helpers/commands/build_py.py | 39 -
.../astropy_helpers/commands/build_sphinx.py | 236 ------
.../astropy_helpers/commands/install.py | 14 -
.../astropy_helpers/commands/install_lib.py | 14 -
.../astropy_helpers/commands/register.py | 53 --
.../astropy_helpers/commands/setup_package.py | 4 -
.../astropy_helpers/commands/src/compiler.c | 129 ---
.../astropy_helpers/commands/test.py | 35 -
.../astropy_helpers/compat/__init__.py | 12 -
.../compat/_subprocess_py2/__init__.py | 38 -
.../astropy_helpers/compat/subprocess.py | 19 -
.../astropy_helpers/distutils_helpers.py | 257 ------
.../astropy_helpers/git_helpers.py | 188 -----
.../astropy_helpers/setup_helpers.py | 734 -----------------
.../astropy_helpers/sphinx/__init__.py | 6 -
.../astropy_helpers/sphinx/conf.py | 332 --------
.../astropy_helpers/sphinx/ext/__init__.py | 3 -
.../sphinx/ext/astropyautosummary.py | 122 ---
.../sphinx/ext/autodoc_enhancements.py | 98 ---
.../astropy_helpers/sphinx/ext/automodapi.py | 364 ---------
.../astropy_helpers/sphinx/ext/automodsumm.py | 606 --------------
.../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 | 38 -
.../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 | 92 ---
.../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_autodoc_enhancements.py | 56 --
.../sphinx/ext/tests/test_automodapi.py | 343 --------
.../sphinx/ext/tests/test_automodsumm.py | 114 ---
.../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 | 220 ------
.../astropy_helpers/sphinx/local/python3links.inv | Bin 483 -> 0 bytes
.../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 -
.../bootstrap-astropy/static/astropy_linkout.svg | 75 --
.../static/astropy_linkout_20.png | Bin 1725 -> 0 bytes
.../bootstrap-astropy/static/astropy_logo.ico | Bin 32988 -> 0 bytes
.../bootstrap-astropy/static/astropy_logo.svg | 87 --
.../bootstrap-astropy/static/astropy_logo_32.png | Bin 1884 -> 0 bytes
.../bootstrap-astropy/static/bootstrap-astropy.css | 596 --------------
.../themes/bootstrap-astropy/static/copybutton.js | 57 --
.../themes/bootstrap-astropy/static/sidebar.js | 160 ----
.../sphinx/themes/bootstrap-astropy/theme.conf | 10 -
.../astropy_helpers/test_helpers.py | 13 -
.../astropy_helpers/tests/__init__.py | 157 ----
.../astropy_helpers/tests/test_ah_bootstrap.py | 419 ----------
.../astropy_helpers/tests/test_git_helpers.py | 237 ------
.../astropy_helpers/tests/test_setup_helpers.py | 506 ------------
.../astropy_helpers/tests/test_utils.py | 24 -
.../astropy_helpers/utils.py | 879 ---------------------
.../astropy_helpers/version.py | 217 -----
.../astropy_helpers/version_helpers.py | 299 -------
astropy_helpers/setup.py | 2 +-
docs/conf.py | 4 +-
docs/credits.rst | 4 +-
docs/development/affiliated-packages.rst | 5 +-
docs/development/ccython.rst | 22 +
docs/io/fits/usage/table.rst | 1 +
docs/io/fits/usage/unfamiliar.rst | 19 +-
docs/io/unified.rst | 4 +-
licenses/LICENSE.rst | 2 +-
setup.py | 2 +-
113 files changed, 1690 insertions(+), 14152 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