[python-astropy] 01/04: Merge branch 'upstream' into debian

Ole Streicher olebole-guest at moszumanska.debian.org
Mon Jul 7 14:56:58 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 0c0ea3a6cad760844031b497f836675f98e1756f
Merge: f3f5cb1 c851128
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jul 7 15:48:31 2014 +0200

    Merge branch 'upstream' into debian
    
    Conflicts:
    	astropy/wcs/include/wcsconfig.h

 CHANGES.rst                                        |   788 +-
 PKG-INFO                                           |     4 +-
 ah_bootstrap.py                                    |   701 +
 astropy/__init__.py                                |    52 +-
 astropy/astropy.cfg                                |   118 +
 astropy/config/__init__.py                         |     2 +-
 astropy/config/configuration.py                    |   828 +-
 astropy/config/paths.py                            |     6 +-
 astropy/config/setup_package.py                    |     6 +
 astropy/config/tests/data/alias.cfg                |     2 +
 astropy/config/tests/data/astropy.0.3.cfg          |   149 +
 astropy/config/tests/data/deprecated.cfg           |     2 +
 astropy/config/tests/data/empty.cfg                |    15 +
 astropy/config/tests/data/not_empty.cfg            |    15 +
 astropy/config/tests/test_configs.py               |   251 +-
 astropy/conftest.py                                |     2 +
 astropy/constants/__init__.py                      |     4 +-
 astropy/constants/constant.py                      |    21 +-
 astropy/constants/si.py                            |     4 +
 astropy/constants/tests/test_constant.py           |    26 +
 astropy/convolution/__init__.py                    |     5 +
 astropy/convolution/boundary_extend.c              |  8608 ----------
 astropy/convolution/boundary_fill.c                |  8737 ----------
 astropy/convolution/boundary_none.c                |  8291 ----------
 astropy/convolution/boundary_wrap.c                |  8608 ----------
 astropy/convolution/convolve.py                    |   179 +-
 astropy/convolution/core.py                        |    38 +-
 astropy/convolution/kernels.py                     |    75 +-
 astropy/{config => convolution}/setup_package.py   |     0
 astropy/convolution/tests/test_convolve.py         |     3 +
 astropy/convolution/tests/test_convolve_fft.py     |    43 +-
 astropy/convolution/tests/test_convolve_kernels.py |     2 +
 astropy/convolution/tests/test_convolve_speeds.py  |     4 +-
 astropy/convolution/tests/test_discretize.py       |     7 +-
 astropy/convolution/tests/test_kernel_class.py     |    25 +-
 astropy/convolution/utils.py                       |    39 +-
 astropy/coordinates/__init__.py                    |    10 +-
 astropy/coordinates/angle_utilities.py             |    57 +-
 astropy/coordinates/angles.py                      |   447 +-
 astropy/coordinates/baseframe.py                   |   983 ++
 astropy/coordinates/builtin_frames.py              |   619 +
 astropy/coordinates/builtin_systems.py             |   784 -
 astropy/coordinates/coordsystems.py                |   773 -
 astropy/coordinates/distances.py                   |   143 +-
 astropy/coordinates/earth.py                       |   281 +
 astropy/coordinates/earth_orientation.py           |     4 +-
 astropy/coordinates/errors.py                      |    38 +-
 astropy/coordinates/matching.py                    |   134 +-
 astropy/coordinates/name_resolve.py                |   121 +-
 astropy/coordinates/old_builtin_systems_names.py   |   124 -
 astropy/coordinates/representation.py              |   708 +
 astropy/coordinates/sky_coordinate.py              |   986 ++
 astropy/coordinates/tests/accuracy/__init__.py     |     2 +
 .../tests/accuracy/test_fk4_no_e_fk4.py            |    59 +-
 .../tests/accuracy/test_fk4_no_e_fk5.py            |    61 +-
 .../tests/accuracy/test_galactic_fk4.py            |    53 +-
 .../coordinates/tests/accuracy/test_icrs_fk5.py    |    53 +-
 astropy/coordinates/tests/test_angles.py           |   484 +-
 .../coordinates/tests/test_angular_separation.py   |    85 +-
 astropy/coordinates/tests/test_api.py              |   728 -
 astropy/coordinates/tests/test_api_ape5.py         |   446 +
 astropy/coordinates/tests/test_arrays.py           |   108 +-
 astropy/coordinates/tests/test_distance.py         |   251 +-
 astropy/coordinates/tests/test_earth.py            |   252 +
 astropy/coordinates/tests/test_formatting.py       |    56 +-
 astropy/coordinates/tests/test_frames.py           |   497 +
 astropy/coordinates/tests/test_matching.py         |    63 +-
 astropy/coordinates/tests/test_name_resolve.py     |    61 +-
 astropy/coordinates/tests/test_representation.py   |   896 +
 astropy/coordinates/tests/test_sky_coord.py        |   710 +
 astropy/coordinates/tests/test_transformations.py  |   177 +-
 astropy/coordinates/transformations.py             |   819 +-
 astropy/cosmology/__init__.py                      |     7 +-
 astropy/cosmology/core.py                          |   416 +-
 astropy/cosmology/funcs.py                         |   250 +-
 astropy/cosmology/parameters.py                    |     8 +
 astropy/{config => cosmology}/setup_package.py     |     0
 astropy/cosmology/tests/test_cosmology.py          |   248 +-
 astropy/extern/pytest.py                           |  6244 +++----
 astropy/extern/six.py                              |   117 +-
 astropy/io/ascii/__init__.py                       |    30 +-
 astropy/io/ascii/basic.py                          |    83 +-
 astropy/io/ascii/cds.py                            |    74 +-
 astropy/io/ascii/connect.py                        |     5 +-
 astropy/io/ascii/core.py                           |   176 +-
 astropy/io/ascii/daophot.py                        |    64 +-
 astropy/io/ascii/fixedwidth.py                     |    29 +-
 astropy/io/ascii/html.py                           |   349 +
 astropy/io/ascii/ipac.py                           |    53 +-
 astropy/io/ascii/latex.py                          |    73 +-
 astropy/io/ascii/setup_package.py                  |    11 +
 astropy/io/ascii/sextractor.py                     |    74 +-
 astropy/io/ascii/tests/common.py                   |     2 +-
 astropy/io/ascii/tests/t/cds_malformed.dat         |    37 +
 astropy/io/ascii/tests/t/daophot3.dat              |   120 +
 astropy/io/ascii/tests/t/html.html                 |    29 +
 astropy/io/ascii/tests/t/html2.html                |    28 +
 astropy/io/ascii/tests/t/sextractor2.dat           |    14 +
 astropy/io/ascii/tests/t/simple_csv.csv            |     3 +
 astropy/io/ascii/tests/t/simple_csv_missing.csv    |     3 +
 .../io/ascii/tests/test_cds_header_from_readme.py  |    14 +-
 astropy/io/ascii/tests/test_connect.py             |    56 +-
 astropy/io/ascii/tests/test_fixedwidth.py          |    62 +-
 astropy/io/ascii/tests/test_html.py                |   461 +
 astropy/io/ascii/tests/test_ipac_definitions.py    |    25 +-
 astropy/io/ascii/tests/test_read.py                |   276 +-
 astropy/io/ascii/tests/test_read_unicode.py        |   680 -
 astropy/io/ascii/tests/test_types.py               |    30 +-
 astropy/io/ascii/tests/test_write.py               |   195 +-
 astropy/io/ascii/tests/test_write_unicode.py       |   288 -
 astropy/io/ascii/ui.py                             |    38 +-
 astropy/io/fits/__init__.py                        |    61 +-
 astropy/io/fits/card.py                            |    92 +-
 astropy/io/fits/column.py                          |   486 +-
 astropy/io/fits/connect.py                         |    45 +-
 astropy/io/fits/convenience.py                     |    25 +-
 astropy/io/fits/diff.py                            |    41 +-
 astropy/io/fits/file.py                            |    14 +-
 astropy/io/fits/fitsrec.py                         |   115 +-
 astropy/io/fits/hdu/base.py                        |   326 +-
 astropy/io/fits/hdu/compressed.py                  |   146 +-
 astropy/io/fits/hdu/groups.py                      |     7 +-
 astropy/io/fits/hdu/hdulist.py                     |    46 +-
 astropy/io/fits/hdu/image.py                       |    30 +-
 astropy/io/fits/hdu/nonstandard.py                 |    11 +-
 astropy/io/fits/hdu/streaming.py                   |    17 +-
 astropy/io/fits/hdu/table.py                       |   180 +-
 astropy/io/fits/header.py                          |   151 +-
 astropy/io/fits/py3compat.py                       |    94 +-
 astropy/io/fits/scripts/fitscheck.py               |     4 +-
 astropy/io/fits/scripts/fitsdiff.py                |     5 +-
 astropy/io/fits/scripts/fitsheader.py              |   159 +
 astropy/io/fits/setup_package.py                   |     6 +-
 astropy/io/fits/src/compressionmodule.c            |    33 +-
 astropy/io/fits/tests/__init__.py                  |    19 +-
 astropy/io/fits/tests/data/blank.fits              |   Bin 0 -> 5760 bytes
 astropy/io/fits/tests/test_checksum.py             |    18 +-
 astropy/io/fits/tests/test_connect.py              |    51 +-
 astropy/io/fits/tests/test_core.py                 |   163 +-
 astropy/io/fits/tests/test_diff.py                 |    47 +-
 astropy/io/fits/tests/test_groups.py               |     2 +-
 astropy/io/fits/tests/test_hdulist.py              |    46 +-
 astropy/io/fits/tests/test_header.py               |   261 +-
 astropy/io/fits/tests/test_image.py                |   497 +-
 astropy/io/fits/tests/test_structured.py           |     2 -
 astropy/io/fits/tests/test_table.py                |   593 +-
 astropy/io/fits/tests/test_uint.py                 |     2 +-
 astropy/io/fits/tests/util.py                      |    34 +-
 astropy/io/fits/util.py                            |   184 +-
 astropy/io/fits/verify.py                          |   127 +-
 astropy/io/misc/connect.py                         |     3 +
 astropy/io/misc/hdf5.py                            |    18 +-
 astropy/io/misc/pickle_helpers.py                  |    17 +-
 astropy/io/misc/tests/test_pickle_helpers.py       |     1 -
 astropy/io/registry.py                             |    95 +-
 astropy/{config => io}/setup_package.py            |     1 -
 astropy/io/tests/test_registry.py                  |    36 +-
 astropy/io/votable/__init__.py                     |    21 +-
 astropy/io/votable/connect.py                      |    23 +-
 astropy/io/votable/converters.py                   |     4 +-
 astropy/io/votable/exceptions.py                   |   170 +-
 astropy/io/votable/setup_package.py                |     2 +-
 astropy/io/votable/table.py                        |    67 +-
 astropy/io/votable/tests/converter_test.py         |    79 +-
 astropy/io/votable/tests/exception_test.py         |    16 +-
 astropy/io/votable/tests/table_test.py             |    42 +-
 astropy/io/votable/tests/ucd_test.py               |     2 +
 astropy/io/votable/tests/util_test.py              |     3 +
 astropy/io/votable/tests/vo_test.py                |    22 +-
 astropy/io/votable/tree.py                         |    84 +-
 astropy/io/votable/ucd.py                          |     4 +
 astropy/io/votable/util.py                         |     6 +-
 astropy/io/votable/validator/main.py               |     9 +-
 astropy/io/votable/validator/result.py             |     2 +-
 astropy/io/votable/xmlutil.py                      |     2 +-
 astropy/logger.py                                  |   163 +-
 astropy/modeling/core.py                           |  1374 +-
 astropy/modeling/fitting.py                        |   830 +-
 astropy/modeling/functional_models.py              |   583 +-
 astropy/modeling/models.py                         |    29 +-
 astropy/modeling/optimizers.py                     |   237 +
 astropy/modeling/parameters.py                     |   251 +-
 astropy/modeling/polynomial.py                     |   363 +-
 astropy/modeling/powerlaws.py                      |    59 +-
 astropy/modeling/projections.py                    |   357 +-
 astropy/modeling/rotations.py                      |   133 +-
 astropy/modeling/setup_package.py                  |     4 +
 astropy/modeling/statistic.py                      |    44 +
 astropy/modeling/tests/data/__init__.py            |     1 +
 astropy/modeling/tests/example_models.py           |     5 +-
 astropy/modeling/tests/irafutil.py                 |     5 +-
 astropy/modeling/tests/test_constraints.py         |   151 +-
 astropy/modeling/tests/test_core.py                |    41 +-
 astropy/modeling/tests/test_fitters.py             |   297 +-
 astropy/modeling/tests/test_functional_models.py   |    70 +-
 astropy/modeling/tests/test_input.py               |   469 +-
 astropy/modeling/tests/test_models.py              |   334 +-
 astropy/modeling/tests/test_parameters.py          |   348 +-
 astropy/modeling/tests/test_polynomial.py          |    42 +-
 astropy/modeling/tests/test_projections.py         |    43 +-
 astropy/modeling/tests/test_rotations.py           |    16 +-
 astropy/modeling/utils.py                          |    69 +-
 astropy/nddata/__init__.py                         |    26 +-
 astropy/nddata/flag_collection.py                  |     6 +-
 astropy/nddata/nddata.py                           |   305 +-
 astropy/nddata/nduncertainty.py                    |    22 +-
 astropy/nddata/tests/test_flag_collection.py       |     2 +
 astropy/nddata/tests/test_nddata.py                |   322 +
 astropy/setup_helpers.py                           |   188 +-
 astropy/{vo/client => }/setup_package.py           |     4 +-
 astropy/sphinx/__init__.py                         |     4 +
 astropy/sphinx/conf.py                             |    75 +-
 astropy/sphinx/ext/__init__.py                     |     4 +
 astropy/sphinx/ext/astropyautosummary.py           |     4 +
 astropy/sphinx/ext/automodapi.py                   |   160 +-
 astropy/sphinx/ext/automodsumm.py                  |   146 +-
 astropy/sphinx/ext/changelog_links.py              |    67 +
 astropy/sphinx/ext/comment_eater.py                |     4 +
 astropy/sphinx/ext/compiler_unparse.py             |     4 +
 astropy/sphinx/ext/docscrape.py                    |     4 +
 astropy/sphinx/ext/docscrape_sphinx.py             |     4 +
 astropy/sphinx/ext/doctest.py                      |     4 +
 astropy/sphinx/ext/edit_on_github.py               |    23 +-
 astropy/sphinx/ext/numpydoc.py                     |     4 +
 astropy/sphinx/ext/phantom_import.py               |     4 +
 astropy/sphinx/ext/smart_resolver.py               |    73 +
 .../sphinx/ext/templates/autosummary_core/base.rst |     6 +
 .../ext/templates/autosummary_core/class.rst       |     6 +
 .../ext/templates/autosummary_core/module.rst      |     6 +
 astropy/sphinx/ext/tests/__init__.py               |     4 +
 astropy/sphinx/ext/tests/test_automodapi.py        |    15 +-
 astropy/sphinx/ext/tests/test_automodsumm.py       |    20 +-
 astropy/sphinx/ext/tocdepthfix.py                  |     4 +
 astropy/sphinx/ext/traitsdoc.py                    |     4 +
 astropy/sphinx/ext/viewcode.py                     |   216 +
 astropy/sphinx/setup_package.py                    |     4 +
 astropy/sphinx/themes/bootstrap-astropy/README.md  |     4 +
 astropy/stats/funcs.py                             |   193 +-
 astropy/stats/tests/test_funcs.py                  |    58 +-
 astropy/table/__init__.py                          |    19 +-
 astropy/table/_np_utils.c                          |  7096 --------
 astropy/table/_np_utils.pyx                        |     2 +-
 astropy/table/column.py                            |   811 +
 astropy/table/groups.py                            |    16 +-
 astropy/table/np_utils.py                          |    19 +-
 astropy/table/pprint.py                            |   730 +-
 astropy/table/table.py                             |  1288 +-
 astropy/table/tests/conftest.py                    |   126 +
 astropy/table/tests/test_column.py                 |    37 +-
 astropy/table/tests/test_groups.py                 |    55 +
 astropy/table/tests/test_init_table.py             |   104 +-
 astropy/table/tests/test_item_access.py            |    50 +-
 astropy/table/tests/test_masked.py                 |    36 +-
 astropy/table/tests/test_np_utils.py               |    16 +-
 astropy/table/tests/test_operations.py             |     9 +-
 astropy/table/tests/test_pickle.py                 |     8 -
 astropy/table/tests/test_pprint.py                 |   101 +-
 astropy/table/tests/test_row.py                    |    34 +-
 astropy/table/tests/test_subclass.py               |    61 +
 astropy/table/tests/test_table.py                  |    79 +-
 astropy/tests/__init__.py                          |     1 +
 astropy/tests/coveragerc                           |     3 +-
 astropy/tests/disable_internet.py                  |   129 +
 astropy/tests/helper.py                            |   646 +-
 astropy/tests/output_checker.py                    |   166 +
 astropy/tests/pytest_plugins.py                    |   282 +-
 astropy/tests/test_logger.py                       |    12 +-
 astropy/tests/tests/test_run_tests.py              |    55 +-
 astropy/tests/tests/test_socketblocker.py          |    54 +
 astropy/time/core.py                               |   756 +-
 astropy/time/erfa_time.c                           | 16574 -------------------
 astropy/time/erfa_time.pyx                         |   633 +-
 astropy/time/setup_package.py                      |     2 +-
 astropy/time/tests/test_basic.py                   |   125 +-
 astropy/time/tests/test_comparisons.py             |    11 +-
 astropy/time/tests/test_delta.py                   |   195 +-
 astropy/time/tests/test_quantity_interaction.py    |     2 +-
 astropy/time/tests/test_sidereal.py                |   167 +
 astropy/time/tests/test_ut1.py                     |    22 +-
 astropy/units/astrophys.py                         |    26 +-
 astropy/units/cds.py                               |     3 +-
 astropy/units/cgs.py                               |     1 +
 astropy/units/core.py                              |   230 +-
 astropy/units/equivalencies.py                     |   115 +-
 astropy/units/format/__init__.py                   |    13 +-
 astropy/units/format/base.py                       |    11 +-
 astropy/units/format/console.py                    |     8 +-
 astropy/units/format/fits.py                       |     7 +-
 astropy/units/format/ogip.py                       |   448 +
 astropy/units/format/ogip_lextab.py                |    12 +
 astropy/units/format/ogip_parsetab.py              |    72 +
 astropy/units/format/unicode_format.py             |     8 +-
 astropy/units/format/utils.py                      |    11 +-
 astropy/units/format/vounit.py                     |    15 +-
 astropy/units/imperial.py                          |    10 +-
 astropy/units/physical.py                          |     3 +
 astropy/units/quantity.py                          |   388 +-
 astropy/units/quantity_helper.py                   |    24 +-
 astropy/units/si.py                                |     5 +-
 astropy/units/tests/test_equivalencies.py          |    74 +-
 astropy/units/tests/test_format.py                 |   125 +-
 astropy/units/tests/test_physical.py               |     2 +
 astropy/units/tests/test_quantity.py               |   205 +-
 astropy/units/tests/test_quantity_array_methods.py |    31 +-
 astropy/units/tests/test_quantity_ufuncs.py        |    38 +-
 astropy/units/tests/test_units.py                  |    38 +-
 astropy/units/utils.py                             |    31 +-
 astropy/utils/collections.py                       |     2 +-
 astropy/utils/compat/__init__.py                   |     3 +
 astropy/utils/compat/misc.py                       |    32 +-
 astropy/utils/compat/numpycompat.py                |    41 +
 astropy/utils/console.py                           |   105 +-
 astropy/utils/data.py                              |   207 +-
 astropy/utils/iers/data/eopc04_IAU2000.62-now      |   187 +
 astropy/utils/misc.py                              |   302 +-
 astropy/utils/setup_package.py                     |     3 +-
 astropy/utils/state.py                             |   186 +
 astropy/utils/tests/data/alias.cfg                 |     2 +
 astropy/utils/tests/test_console.py                |    25 +-
 astropy/utils/tests/test_data.py                   |    29 +-
 astropy/utils/tests/test_gzip.py                   |     3 +-
 astropy/utils/tests/test_misc.py                   |    39 +
 astropy/utils/tests/test_state.py                  |    71 +
 astropy/utils/tests/test_timer.py                  |    71 +-
 astropy/utils/timer.py                             |    95 +-
 astropy/utils/xml/iterparser.py                    |    36 +-
 astropy/utils/xml/setup_package.py                 |     2 +-
 astropy/utils/xml/validate.py                      |     2 +-
 astropy/utils/xml/writer.py                        |     6 +-
 astropy/version.py                                 |   114 +-
 astropy/version_helpers.py                         |     7 +
 astropy/vo/__init__.py                             |    23 +
 astropy/vo/client/async.py                         |     2 +-
 astropy/vo/client/conesearch.py                    |   149 +-
 astropy/vo/client/exceptions.py                    |    42 +
 astropy/vo/client/setup_package.py                 |     6 +-
 astropy/vo/client/tests/data/basic.json            |    10 +
 .../tests/{test_vo.py => test_conesearch.py}       |    86 +-
 astropy/vo/client/tests/test_vos_catalog.py        |   213 +
 astropy/vo/client/vos_catalog.py                   |   608 +-
 astropy/vo/samp/__init__.py                        |    33 +
 astropy/vo/samp/client.py                          |   772 +
 astropy/vo/samp/constants.py                       |    35 +
 astropy/vo/samp/data/astropy_icon.png              |   Bin 0 -> 1434 bytes
 astropy/vo/samp/data/clientaccesspolicy.xml        |    13 +
 astropy/vo/samp/data/crossdomain.xml               |     7 +
 astropy/vo/samp/errors.py                          |    37 +
 astropy/vo/samp/hub.py                             |  1520 ++
 astropy/vo/samp/hub_proxy.py                       |   257 +
 astropy/vo/samp/hub_script.py                      |   222 +
 astropy/vo/samp/integrated_client.py               |   549 +
 astropy/vo/samp/lockfile_helpers.py                |   282 +
 astropy/vo/samp/setup_package.py                   |    14 +
 astropy/vo/samp/ssl_utils.py                       |   160 +
 astropy/vo/samp/standard_profile.py                |   248 +
 astropy/{sphinx/ext => vo/samp}/tests/__init__.py  |     0
 astropy/vo/samp/tests/data/README.md               |    54 +
 astropy/vo/samp/tests/data/test1.crt               |    10 +
 astropy/vo/samp/tests/data/test1.key               |     9 +
 astropy/vo/samp/tests/data/test2.crt               |    10 +
 astropy/vo/samp/tests/data/test2.key               |     9 +
 astropy/vo/samp/tests/test_client.py               |    27 +
 astropy/vo/samp/tests/test_errors.py               |    24 +
 astropy/vo/samp/tests/test_helpers.py              |    70 +
 astropy/vo/samp/tests/test_hub.py                  |    23 +
 astropy/vo/samp/tests/test_hub_proxy.py            |    51 +
 astropy/vo/samp/tests/test_hub_script.py           |    24 +
 astropy/vo/samp/tests/test_standard_profile.py     |   290 +
 astropy/vo/samp/tests/test_web_profile.py          |    96 +
 astropy/vo/samp/tests/web_profile_test_helpers.py  |   264 +
 astropy/vo/samp/utils.py                           |   168 +
 astropy/vo/samp/web_profile.py                     |   184 +
 astropy/vo/validator/__init__.py                   |    35 +
 astropy/vo/validator/exceptions.py                 |    21 +
 astropy/vo/validator/inspect.py                    |    22 +-
 astropy/vo/validator/setup_package.py              |     4 +
 astropy/vo/validator/tests/test_inpect.py          |    75 +
 astropy/vo/validator/tests/test_validate.py        |   126 +-
 astropy/vo/validator/tstquery.py                   |    17 +-
 astropy/vo/validator/validate.py                   |   255 +-
 astropy/wcs/__init__.py                            |     1 +
 astropy/wcs/docstrings.py                          |   223 +-
 astropy/wcs/include/astropy_wcs/astropy_wcs_api.h  |    17 +-
 astropy/wcs/include/astropy_wcs/docstrings.h       |    38 +-
 astropy/wcs/include/astropy_wcs/wcsconfig.h        |     2 +-
 astropy/wcs/include/{astropy_wcs => }/wcsconfig.h  |     2 +-
 astropy/wcs/include/wcslib/cel.h                   |     8 +-
 astropy/wcs/include/wcslib/lin.h                   |     8 +-
 astropy/wcs/include/wcslib/prj.h                   |    87 +-
 astropy/wcs/include/wcslib/spc.h                   |     8 +-
 astropy/wcs/include/wcslib/spx.h                   |     8 +-
 astropy/wcs/include/wcslib/tab.h                   |    40 +-
 astropy/wcs/include/wcslib/wcs.h                   |    97 +-
 astropy/wcs/include/wcslib/wcserr.h                |     6 +-
 astropy/wcs/include/wcslib/wcsmath.h               |     6 +-
 astropy/wcs/include/wcslib/wcsprintf.h             |     8 +-
 astropy/wcs/setup_package.py                       |    31 +-
 astropy/wcs/src/astropy_wcs.c                      |     4 -
 astropy/wcs/src/docstrings.c                       |  1539 +-
 astropy/wcs/src/sip_wrap.c                         |    32 +
 astropy/wcs/src/unit_list_proxy.c                  |     3 +
 astropy/wcs/src/wcslib_units_wrap.c                |   389 -
 astropy/wcs/src/wcslib_wrap.c                      |   130 +-
 astropy/wcs/tests/data/irac_sip.hdr                |     1 +
 astropy/wcs/tests/data/nonstandard_units.hdr       |     2 +-
 astropy/wcs/tests/data/unit.hdr                    |     1 +
 astropy/wcs/tests/data/zpn-hole.hdr                |     1 +
 .../ext/tests => wcs/tests/extension}/__init__.py  |     0
 astropy/wcs/tests/extension/setup.py               |    45 +
 astropy/wcs/tests/extension/test_extension.py      |    49 +
 astropy/wcs/tests/extension/wcsapi_test.c          |    76 +
 astropy/wcs/tests/test_pickle.py                   |     1 +
 astropy/wcs/tests/test_utils.py                    |   141 +
 astropy/wcs/tests/test_wcs.py                      |   231 +-
 astropy/wcs/tests/test_wcsprm.py                   |    33 +-
 astropy/wcs/utils.py                               |    27 +
 astropy/wcs/wcs.py                                 |   332 +-
 .../coveragerc => astropy_helpers/.coveragerc      |    19 +-
 astropy_helpers/.travis.yml                        |    41 +
 astropy_helpers/CHANGES.rst                        |    22 +
 {licenses => astropy_helpers}/LICENSE.rst          |     2 +-
 astropy_helpers/MANIFEST.in                        |    10 +
 astropy_helpers/README.rst                         |    30 +
 astropy_helpers/ah_bootstrap.py                    |   701 +
 astropy_helpers/astropy_helpers.egg-info/PKG-INFO  |    11 +
 .../astropy_helpers.egg-info/SOURCES.txt           |    49 +
 .../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/__init__.pyc       |   Bin 0 -> 275 bytes
 astropy_helpers/astropy_helpers/compat/__init__.py |    12 +
 .../astropy_helpers/compat/__init__.pyc            |   Bin 0 -> 1016 bytes
 .../compat/_subprocess_py2/__init__.py             |    38 +
 .../astropy_helpers/compat/subprocess.py           |    19 +
 .../astropy_helpers/compat/subprocess.pyc          |   Bin 0 -> 750 bytes
 astropy_helpers/astropy_helpers/git_helpers.py     |   113 +
 astropy_helpers/astropy_helpers/git_helpers.pyc    |   Bin 0 -> 3145 bytes
 .../astropy_helpers}/setup_helpers.py              |   508 +-
 astropy_helpers/astropy_helpers/setup_helpers.pyc  |   Bin 0 -> 46828 bytes
 .../astropy_helpers}/sphinx/__init__.py            |     0
 .../astropy_helpers/sphinx/__init__.pyc            |   Bin 268 -> 450 bytes
 .../astropy_helpers}/sphinx/conf.py                |    86 +-
 astropy_helpers/astropy_helpers/sphinx/conf.pyc    |   Bin 0 -> 5115 bytes
 .../astropy_helpers/sphinx/ext/__init__.py         |     3 +
 .../astropy_helpers/sphinx/ext/__init__.pyc        |   Bin 0 -> 346 bytes
 .../sphinx/ext/astropyautosummary.py               |     0
 .../sphinx/ext/astropyautosummary.pyc              |   Bin 0 -> 3048 bytes
 .../astropy_helpers}/sphinx/ext/automodapi.py      |   165 +-
 .../astropy_helpers/sphinx/ext/automodapi.pyc      |   Bin 0 -> 10246 bytes
 .../astropy_helpers}/sphinx/ext/automodsumm.py     |   150 +-
 .../astropy_helpers/sphinx/ext/automodsumm.pyc     |   Bin 0 -> 17553 bytes
 .../astropy_helpers/sphinx/ext/changelog_links.py  |    66 +
 .../astropy_helpers/sphinx/ext/changelog_links.pyc |   Bin 0 -> 1934 bytes
 .../astropy_helpers}/sphinx/ext/comment_eater.py   |    19 +-
 .../sphinx/ext/compiler_unparse.py                 |    27 +-
 .../astropy_helpers}/sphinx/ext/docscrape.py       |    83 +-
 .../astropy_helpers/sphinx/ext/docscrape.pyc       |   Bin 0 -> 20801 bytes
 .../sphinx/ext/docscrape_sphinx.py                 |    99 +-
 .../sphinx/ext/docscrape_sphinx.pyc                |   Bin 0 -> 12329 bytes
 .../astropy_helpers}/sphinx/ext/doctest.py         |     0
 .../astropy_helpers/sphinx/ext/doctest.pyc         |   Bin 0 -> 1802 bytes
 .../astropy_helpers}/sphinx/ext/edit_on_github.py  |    19 +-
 .../astropy_helpers/sphinx/ext/edit_on_github.pyc  |   Bin 0 -> 5970 bytes
 .../astropy_helpers}/sphinx/ext/numpydoc.py        |    70 +-
 .../astropy_helpers/sphinx/ext/numpydoc.pyc        |   Bin 0 -> 7818 bytes
 .../astropy_helpers}/sphinx/ext/phantom_import.py  |     9 +-
 .../astropy_helpers/sphinx/ext/smart_resolver.py   |    69 +
 .../astropy_helpers/sphinx/ext/smart_resolver.pyc  |   Bin 0 -> 2692 bytes
 .../sphinx/ext/templates/autosummary_core/base.rst |     0
 .../ext/templates/autosummary_core/class.rst       |     0
 .../ext/templates/autosummary_core/module.rst      |     0
 .../astropy_helpers/sphinx/ext/tests/__init__.py   |    70 +
 .../sphinx/ext/tests/test_automodapi.py            |   119 +-
 .../sphinx/ext/tests/test_automodsumm.py           |    63 +-
 .../sphinx/ext/tests/test_docscrape.py             |   762 +
 .../astropy_helpers/sphinx/ext/tests/test_utils.py |    34 +
 .../astropy_helpers}/sphinx/ext/tocdepthfix.py     |     0
 .../astropy_helpers/sphinx/ext/tocdepthfix.pyc     |   Bin 0 -> 939 bytes
 .../astropy_helpers}/sphinx/ext/traitsdoc.py       |    14 +-
 .../astropy_helpers/sphinx/ext/utils.py            |    65 +
 .../astropy_helpers/sphinx/ext/utils.pyc           |   Bin 0 -> 2512 bytes
 .../astropy_helpers/sphinx/ext/viewcode.py         |   212 +
 .../astropy_helpers/sphinx/ext/viewcode.pyc        |   Bin 0 -> 6640 bytes
 .../astropy_helpers/sphinx/local/python3links.inv  |     7 +
 .../astropy_helpers/sphinx/local/python3links.txt  |    13 +
 .../astropy_helpers}/sphinx/setup_package.py       |     3 +-
 .../astropy_helpers/sphinx/setup_package.pyc       |   Bin 0 -> 412 bytes
 .../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 0 -> 1725 bytes
 .../bootstrap-astropy/static/astropy_logo.ico      |   Bin 0 -> 1150 bytes
 .../bootstrap-astropy/static/astropy_logo_32.png   |   Bin 0 -> 1884 bytes
 .../bootstrap-astropy/static/bootstrap-astropy.css |   573 +
 .../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/astropy_helpers/src/compiler.c     |   129 +
 .../astropy_helpers/src/setup_package.py           |     2 +
 .../astropy_helpers/src/setup_package.pyc          |   Bin 0 -> 311 bytes
 astropy_helpers/astropy_helpers/test_helpers.py    |   207 +
 astropy_helpers/astropy_helpers/test_helpers.pyc   |   Bin 0 -> 7804 bytes
 astropy_helpers/astropy_helpers/tests/__init__.py  |   172 +
 .../astropy_helpers/tests/test_ah_bootstrap.py     |   336 +
 .../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/utils.pyc          |   Bin 0 -> 5303 bytes
 astropy_helpers/astropy_helpers/version.py         |   125 +
 astropy_helpers/astropy_helpers/version.pyc        |   Bin 0 -> 3386 bytes
 .../astropy_helpers}/version_helpers.py            |   184 +-
 .../astropy_helpers/version_helpers.pyc            |   Bin 0 -> 4983 bytes
 ez_setup.py => astropy_helpers/ez_setup.py         |   160 +-
 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 +
 cextern/erfa/erfa.c                                |  5469 +++++-
 cextern/erfa/erfa.h                                |   339 +-
 cextern/patches/cunit-fix-message.diff             |    11 -
 cextern/patches/unit-translate-information.diff    |    20 -
 cextern/trim_wcslib.sh                             |     3 -
 cextern/wcslib/C/GNUmakefile                       |     9 +-
 cextern/wcslib/C/cel.c                             |     6 +-
 cextern/wcslib/C/cel.h                             |     8 +-
 cextern/wcslib/C/fitshdr.h                         |    14 +-
 cextern/wcslib/C/fitshdr.l                         |     6 +-
 cextern/wcslib/C/flexed/fitshdr.c                  |     6 +-
 cextern/wcslib/C/flexed/wcsbth.c                   |     6 +-
 cextern/wcslib/C/flexed/wcspih.c                   |     6 +-
 cextern/wcslib/C/flexed/wcsulex.c                  |     6 +-
 cextern/wcslib/C/flexed/wcsutrn.c                  |     6 +-
 cextern/wcslib/C/getwcstab.c                       |     6 +-
 cextern/wcslib/C/getwcstab.h                       |     6 +-
 cextern/wcslib/C/lin.c                             |     6 +-
 cextern/wcslib/C/lin.h                             |     8 +-
 cextern/wcslib/C/log.c                             |     6 +-
 cextern/wcslib/C/log.h                             |     8 +-
 cextern/wcslib/C/prj.c                             |   525 +-
 cextern/wcslib/C/prj.h                             |    87 +-
 cextern/wcslib/C/spc.c                             |     6 +-
 cextern/wcslib/C/spc.h                             |     8 +-
 cextern/wcslib/C/sph.c                             |     6 +-
 cextern/wcslib/C/sph.h                             |     8 +-
 cextern/wcslib/C/spx.c                             |     6 +-
 cextern/wcslib/C/spx.h                             |     8 +-
 cextern/wcslib/C/tab.c                             |    55 +-
 cextern/wcslib/C/tab.h                             |    40 +-
 cextern/wcslib/C/wcs.c                             |   215 +-
 cextern/wcslib/C/wcs.h                             |    97 +-
 cextern/wcslib/C/wcsbth.l                          |     6 +-
 cextern/wcslib/C/wcserr.c                          |     6 +-
 cextern/wcslib/C/wcserr.h                          |     6 +-
 cextern/wcslib/C/wcsfix.c                          |     9 +-
 cextern/wcslib/C/wcsfix.h                          |     8 +-
 cextern/wcslib/C/wcshdr.c                          |    10 +-
 cextern/wcslib/C/wcshdr.h                          |     8 +-
 cextern/wcslib/C/wcslib.h                          |     8 +-
 cextern/wcslib/C/wcsmath.h                         |     6 +-
 cextern/wcslib/C/wcspih.l                          |     6 +-
 cextern/wcslib/C/wcsprintf.c                       |     6 +-
 cextern/wcslib/C/wcsprintf.h                       |     8 +-
 cextern/wcslib/C/wcstrig.c                         |     6 +-
 cextern/wcslib/C/wcstrig.h                         |     6 +-
 cextern/wcslib/C/wcsulex.l                         |     6 +-
 cextern/wcslib/C/wcsunits.c                        |     6 +-
 cextern/wcslib/C/wcsunits.h                        |    18 +-
 cextern/wcslib/C/wcsutil.c                         |   150 +-
 cextern/wcslib/C/wcsutil.h                         |    81 +-
 cextern/wcslib/C/wcsutrn.l                         |     6 +-
 cextern/wcslib/CHANGES                             |   102 +-
 cextern/wcslib/GNUmakefile                         |     4 +-
 cextern/wcslib/INSTALL                             |     8 +-
 cextern/wcslib/README                              |     8 +-
 cextern/wcslib/THANKS                              |     3 +-
 cextern/wcslib/VALIDATION                          |    52 +-
 cextern/wcslib/configure                           |    24 +-
 cextern/wcslib/configure.ac                        |     6 +-
 cextern/wcslib/flavours                            |     2 +-
 cextern/wcslib/makedefs.in                         |     8 +-
 cextern/wcslib/wcsconfig.h.in                      |     4 +-
 cextern/wcslib/wcsconfig_f77.h.in                  |     4 +-
 cextern/wcslib/wcsconfig_tests.h.in                |     4 +-
 cextern/wcslib/wcsconfig_utils.h.in                |     4 +-
 docs/conf.py                                       |    51 +-
 docs/config/config_0_4_transition.rst              |   317 +
 docs/config/index.rst                              |   347 +-
 docs/constants/index.rst                           |    10 +-
 docs/convolution/index.rst                         |    26 +-
 docs/convolution/kernels.rst                       |    84 +-
 docs/convolution/using.rst                         |     6 +-
 docs/coordinates/angles.rst                        |   133 +-
 docs/coordinates/creating.rst                      |    81 -
 docs/coordinates/definitions.rst                   |    41 +
 docs/coordinates/designing.rst                     |    21 -
 docs/coordinates/distances.rst                     |   104 -
 docs/coordinates/formatting.rst                    |    19 +-
 docs/coordinates/frames.rst                        |   340 +
 docs/coordinates/index.rst                         |   365 +-
 docs/coordinates/matching.rst                      |    38 -
 docs/coordinates/matchsep.rst                      |   112 +
 docs/coordinates/references.txt                    |     6 +
 docs/coordinates/representations.rst               |   167 +
 docs/coordinates/separations.rst                   |    26 -
 docs/coordinates/sgr-example.py                    |   111 +-
 docs/coordinates/sgr-example.rst                   |   307 +-
 docs/coordinates/skycoord.rst                      |   681 +
 docs/coordinates/transforming.rst                  |   137 +-
 docs/cosmology/index.rst                           |   391 +-
 docs/credits.rst                                   |    34 +
 docs/development/building.rst                      |    42 +-
 docs/development/ccython.rst                       |    28 +-
 docs/development/codeguide.rst                     |   146 +-
 docs/development/codeguide_emacs.rst               |    54 +-
 docs/development/docguide.rst                      |    26 +-
 docs/development/docrules.rst                      |     5 +-
 docs/development/releasing.rst                     |    52 +-
 docs/development/testguide.rst                     |   180 +-
 .../development/workflow/additional_git_topics.rst |   413 +
 docs/development/workflow/branch_dropdown.png      |   Bin 16311 -> 39966 bytes
 docs/development/workflow/command_history.rst      |    30 +
 docs/development/workflow/command_history.sh       |   112 +
 .../workflow/command_history_with_output.sh        |   457 +
 docs/development/workflow/development_workflow.rst |  1000 +-
 docs/development/workflow/forking_button.png       |   Bin 13092 -> 9495 bytes
 docs/development/workflow/get_devel_version.rst    |   334 +
 docs/development/workflow/git_configure.rst        |   168 -
 .../workflow/git_edit_workflow_examples.rst        |   562 +
 docs/development/workflow/git_install.rst          |    68 +-
 docs/development/workflow/git_links.inc            |     1 +
 docs/development/workflow/git_resources.rst        |   110 +-
 docs/development/workflow/index.rst                |    53 -
 docs/development/workflow/known_projects.inc       |    14 +-
 docs/development/workflow/maintainer_workflow.rst  |     6 +-
 docs/development/workflow/milestone.png            |   Bin 0 -> 23069 bytes
 docs/development/workflow/patches.rst              |     2 +-
 docs/development/workflow/pull_button.png          |   Bin 12893 -> 15528 bytes
 docs/development/workflow/terminal_cast.rst        |    17 +
 docs/development/workflow/virtual_pythons.rst      |   189 +
 docs/development/workflow/virtualenv_detail.rst    |   164 +
 .../workflow/worked_example_switch_branch.png      |   Bin 0 -> 34439 bytes
 docs/getting_started.rst                           |     6 +-
 docs/index.rst                                     |    78 +-
 docs/install.rst                                   |    78 +-
 docs/io/ascii/base_classes.rst                     |    14 +-
 docs/io/ascii/extension_classes.rst                |    32 +-
 docs/io/ascii/index.rst                            |    51 +-
 docs/io/ascii/read.rst                             |    44 +-
 docs/io/ascii/references.txt                       |     4 +-
 docs/io/ascii/write.rst                            |    50 +-
 docs/io/fits/api/hdus.rst                          |     4 +-
 docs/io/fits/api/verification.rst                  |     4 +-
 docs/io/fits/appendix/faq.rst                      |    15 +-
 docs/io/fits/appendix/header_transition.rst        |    20 +-
 docs/io/fits/appendix/history.rst                  |   165 +-
 docs/io/fits/index.rst                             |    52 +-
 docs/io/fits/usage/misc.rst                        |     2 +-
 docs/io/fits/usage/scripts.rst                     |     4 +
 docs/io/fits/usage/table.rst                       |   114 +-
 docs/io/fits/usage/unfamiliar.rst                  |   162 +-
 docs/io/fits/usage/verification.rst                |    46 +-
 docs/io/misc.rst                                   |     4 +-
 docs/io/registry.rst                               |    16 +-
 docs/io/unified.rst                                |    76 +-
 docs/io/votable/index.rst                          |    69 +-
 docs/known_issues.rst                              |    10 +-
 docs/license.rst                                   |     4 +-
 docs/modeling/algorithms.rst                       |     6 +-
 docs/modeling/design.rst                           |     8 +-
 docs/modeling/fitting.rst                          |   128 +-
 docs/modeling/index.rst                            |   168 +-
 docs/modeling/links.inc                            |     1 +
 docs/modeling/models.rst                           |   413 +-
 docs/modeling/new.rst                              |   300 +-
 docs/modeling/parameters.rst                       |   243 +-
 docs/nddata/index.rst                              |    16 +-
 docs/nddata/nddata.rst                             |    70 +-
 docs/nddata/subclassing.rst                        |    12 +-
 docs/nitpick-exceptions                            |    55 +
 docs/overview.rst                                  |    20 +-
 docs/rtd-pip-requirements                          |     1 +
 docs/stability.rst                                 |     2 +-
 docs/table/access_table.rst                        |   119 +-
 docs/table/construct_table.rst                     |   239 +-
 docs/table/index.rst                               |    30 +-
 docs/table/io.rst                                  |    23 +-
 docs/table/masking.rst                             |     8 +-
 docs/table/modify_table.rst                        |    10 +-
 docs/table/operations.rst                          |    42 +-
 docs/table/references.txt                          |    10 +-
 docs/time/index.rst                                |   351 +-
 docs/time/references.txt                           |     4 +-
 docs/time/time_scale_conversion.odg                |   Bin 10570 -> 12434 bytes
 docs/time/time_scale_conversion.png                |   Bin 33595 -> 6773 bytes
 docs/units/combining_and_defining.rst              |     4 +-
 docs/units/conversion.rst                          |     4 +-
 docs/units/equivalencies.rst                       |    37 +-
 docs/units/format.rst                              |    33 +-
 docs/units/index.rst                               |    18 +-
 docs/units/quantity.rst                            |   137 +-
 docs/units/standard_units.rst                      |     4 +-
 docs/utils/index.rst                               |     9 +-
 docs/vo/{ => conesearch}/client.rst                |   460 +-
 .../images/astropy_vo_flowchart.png                |   Bin
 .../images/client_predict_search_n.png             |   Bin
 .../images/client_predict_search_t.png             |   Bin
 .../{ => conesearch}/images/validator_html_1.png   |   Bin
 .../{ => conesearch}/images/validator_html_2.png   |   Bin
 .../{ => conesearch}/images/validator_html_3.png   |   Bin
 .../{ => conesearch}/images/validator_html_4.png   |   Bin
 docs/vo/{conesearch.rst => conesearch/index.rst}   |    22 +-
 docs/vo/{ => conesearch}/validator.rst             |   288 +-
 docs/vo/index.rst                                  |    16 +-
 docs/vo/samp/advanced_embed_samp_hub.rst           |   134 +
 docs/vo/samp/example_clients.rst                   |   127 +
 docs/vo/samp/example_hub.rst                       |    51 +
 docs/vo/samp/example_table_image.rst               |   274 +
 docs/vo/samp/index.rst                             |    67 +
 docs/vo/samp/references.txt                        |     5 +
 docs/wcs/history.rst                               |     8 +-
 docs/wcs/index.rst                                 |     4 +-
 docs/wcs/relax.rst                                 |    70 +-
 docs/whatsnew/0.1.rst                              |     8 +-
 docs/whatsnew/0.2.rst                              |   295 +-
 docs/whatsnew/0.3.rst                              |   507 +-
 docs/whatsnew/0.4.rst                              |   121 +
 docs/whatsnew/index.rst                            |     1 +
 ez_setup.py                                        |   160 +-
 licenses/LICENSE.rst                               |     2 +-
 licenses/PYFITS.rst                                |     2 +-
 licenses/SYMPY.rst                                 |    28 +
 scripts/fitsheader                                 |     5 +
 scripts/samp_hub                                   |     4 +
 setup.cfg                                          |     7 +-
 setup.py                                           |    21 +-
 setuptools_bootstrap.py                            |    34 -
 740 files changed, 63879 insertions(+), 83307 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