[python-astropy] 01/04: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Sun Aug 10 13:07:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository python-astropy.
commit 46f132227c6b6c72a74111148d9f0a8de0a7eef5
Merge: 4f540c5 2525911
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Aug 10 10:21:08 2014 +0200
Merge branch 'upstream' into debian
CHANGES.rst | 105 ++++
PKG-INFO | 4 +-
ah_bootstrap.py | 94 ++-
astropy/astropy.cfg | 37 ++
astropy/config/configuration.py | 32 +-
astropy/config/tests/test_configs.py | 7 +
astropy/convolution/boundary_extend.c | 4 +-
astropy/convolution/boundary_fill.c | 4 +-
astropy/convolution/boundary_none.c | 4 +-
astropy/convolution/boundary_wrap.c | 4 +-
astropy/convolution/convolve.py | 3 +-
astropy/convolution/core.py | 14 +-
astropy/convolution/tests/test_kernel_class.py | 32 +-
astropy/coordinates/distances.py | 147 +++--
astropy/coordinates/tests/test_angles.py | 13 +-
astropy/coordinates/tests/test_distance.py | 17 +-
astropy/extern/__init__.py | 12 +-
astropy/extern/bundled/__init__.py | 0
astropy/extern/{ => bundled}/six.py | 0
astropy/extern/six.py | 654 ++-------------------
astropy/io/fits/connect.py | 11 +-
astropy/io/misc/hdf5.py | 41 +-
astropy/io/misc/tests/test_hdf5.py | 19 +
astropy/logger.py | 22 +-
astropy/nddata/nddata.py | 3 +-
astropy/nddata/tests/test_nddata.py | 10 +
.../bootstrap-astropy/static/bootstrap-astropy.css | 7 +-
astropy/table/_np_utils.c | 4 +-
astropy/table/jsviewer.py | 52 +-
astropy/tests/pytest_plugins.py | 3 +-
astropy/tests/test_logger.py | 23 +
astropy/time/erfa_time.c | 4 +-
astropy/units/astrophys.py | 16 +-
astropy/units/format/fits.py | 8 +-
astropy/units/quantity.py | 14 +-
astropy/units/tests/test_format.py | 14 +-
astropy/units/tests/test_quantity.py | 13 +-
astropy/utils/misc.py | 40 +-
astropy/utils/tests/test_misc.py | 32 +
astropy/version.py | 98 ++-
astropy/vo/validator/data/conesearch_urls.txt | 14 +-
astropy/wcs/docstrings.py | 2 +
astropy/wcs/include/astropy_wcs/docstrings.h | 2 +-
astropy/wcs/src/astropy_wcs.c | 4 +
astropy/wcs/src/docstrings.c | 73 +--
astropy/wcs/tests/extension/setup.py | 9 +-
astropy/wcs/tests/test_wcs.py | 4 +-
astropy/wcs/wcs.py | 2 +-
astropy_helpers/.travis.yml | 2 +-
astropy_helpers/CHANGES.rst | 25 +
astropy_helpers/ah_bootstrap.py | 94 ++-
astropy_helpers/astropy_helpers/__init__.pyc | Bin 291 -> 283 bytes
.../__pycache__/__init__.cpython-32.pyc | Bin 0 -> 295 bytes
.../__pycache__/__init__.cpython-33.pyc | Bin 0 -> 299 bytes
.../__pycache__/__init__.cpython-34.pyc | Bin 0 -> 262 bytes
.../__pycache__/git_helpers.cpython-32.pyc | Bin 0 -> 3340 bytes
.../__pycache__/git_helpers.cpython-33.pyc | Bin 0 -> 3391 bytes
.../__pycache__/git_helpers.cpython-34.pyc | Bin 0 -> 3635 bytes
.../__pycache__/setup_helpers.cpython-32.pyc | Bin 0 -> 54363 bytes
.../__pycache__/setup_helpers.cpython-33.pyc | Bin 0 -> 56435 bytes
.../__pycache__/setup_helpers.cpython-34.pyc | Bin 0 -> 41235 bytes
.../__pycache__/test_helpers.cpython-32.pyc | Bin 0 -> 8159 bytes
.../__pycache__/test_helpers.cpython-33.pyc | Bin 0 -> 8302 bytes
.../__pycache__/test_helpers.cpython-34.pyc | Bin 0 -> 5726 bytes
.../__pycache__/utils.cpython-32.pyc | Bin 0 -> 6256 bytes
.../__pycache__/utils.cpython-33.pyc | Bin 0 -> 6550 bytes
.../__pycache__/utils.cpython-34.pyc | Bin 0 -> 4575 bytes
.../__pycache__/version.cpython-32.pyc | Bin 0 -> 3682 bytes
.../__pycache__/version.cpython-33.pyc | Bin 0 -> 3733 bytes
.../__pycache__/version.cpython-34.pyc | Bin 0 -> 3108 bytes
.../__pycache__/version_helpers.cpython-32.pyc | Bin 0 -> 5586 bytes
.../__pycache__/version_helpers.cpython-33.pyc | Bin 0 -> 5666 bytes
.../__pycache__/version_helpers.cpython-34.pyc | Bin 0 -> 4415 bytes
.../astropy_helpers/compat/__init__.pyc | Bin 1080 -> 1048 bytes
.../compat/__pycache__/__init__.cpython-32.pyc | Bin 0 -> 1324 bytes
.../compat/__pycache__/__init__.cpython-33.pyc | Bin 0 -> 1502 bytes
.../compat/__pycache__/__init__.cpython-34.pyc | Bin 0 -> 970 bytes
astropy_helpers/astropy_helpers/git_helpers.py | 92 ++-
astropy_helpers/astropy_helpers/git_helpers.pyc | Bin 3193 -> 4126 bytes
astropy_helpers/astropy_helpers/setup_helpers.py | 11 +
astropy_helpers/astropy_helpers/setup_helpers.pyc | Bin 47767 -> 47689 bytes
.../astropy_helpers/sphinx/__init__.pyc | Bin 0 -> 458 bytes
astropy_helpers/astropy_helpers/sphinx/conf.pyc | Bin 0 -> 5131 bytes
.../astropy_helpers/sphinx/ext/__init__.pyc | Bin 0 -> 354 bytes
.../sphinx/ext/astropyautosummary.pyc | Bin 0 -> 3080 bytes
.../astropy_helpers/sphinx/ext/automodapi.pyc | Bin 0 -> 10286 bytes
.../astropy_helpers/sphinx/ext/automodsumm.pyc | Bin 0 -> 17648 bytes
.../astropy_helpers/sphinx/ext/changelog_links.py | 16 +-
.../astropy_helpers/sphinx/ext/changelog_links.pyc | Bin 0 -> 1958 bytes
.../astropy_helpers/sphinx/ext/docscrape.pyc | Bin 0 -> 21233 bytes
.../sphinx/ext/docscrape_sphinx.pyc | Bin 0 -> 12577 bytes
.../astropy_helpers/sphinx/ext/doctest.pyc | Bin 0 -> 1842 bytes
.../astropy_helpers/sphinx/ext/edit_on_github.pyc | Bin 0 -> 6018 bytes
.../astropy_helpers/sphinx/ext/numpydoc.pyc | Bin 0 -> 7938 bytes
.../astropy_helpers/sphinx/ext/smart_resolver.pyc | Bin 0 -> 2724 bytes
.../astropy_helpers/sphinx/ext/tocdepthfix.pyc | Bin 0 -> 963 bytes
.../astropy_helpers/sphinx/ext/utils.pyc | Bin 0 -> 2528 bytes
.../astropy_helpers/sphinx/ext/viewcode.pyc | Bin 0 -> 6777 bytes
.../astropy_helpers/sphinx/setup_package.pyc | Bin 433 -> 433 bytes
.../bootstrap-astropy/static/bootstrap-astropy.css | 7 +-
.../astropy_helpers/src/setup_package.pyc | Bin 311 -> 311 bytes
astropy_helpers/astropy_helpers/test_helpers.pyc | Bin 7884 -> 7844 bytes
astropy_helpers/astropy_helpers/tests/__init__.py | 2 +-
.../astropy_helpers/tests/test_ah_bootstrap.py | 37 +-
astropy_helpers/astropy_helpers/utils.pyc | Bin 5495 -> 5399 bytes
astropy_helpers/astropy_helpers/version.py | 2 +-
astropy_helpers/astropy_helpers/version.pyc | Bin 3494 -> 3470 bytes
.../astropy_helpers/version_helpers.pyc | Bin 5047 -> 5015 bytes
astropy_helpers/setup.py | 4 +-
docs/config/config_0_4_transition.rst | 8 +
docs/coordinates/matchsep.rst | 4 +-
docs/development/codeguide_emacs.rst | 5 +-
docs/development/testguide.rst | 21 +
docs/index.rst | 13 +-
docs/install.rst | 2 +-
docs/io/unified.rst | 9 +-
docs/known_issues.rst | 17 +-
docs/table/modify_table.rst | 16 +
docs/wcs/index.rst | 12 +
setup.py | 2 +-
120 files changed, 1129 insertions(+), 1003 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