setup.cfg | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 disable astropy-helpers copy

astropy/io/fits/tests/test_image.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 make tformx check more flexible the maximal column length in cfitsio
 changed between version 3370 and 3380. This patch checks their syntax,
 without a specific length.

setup.py | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 install the scripts only for the python 3 version

astropy/io/misc/tests/test_hdf5.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 work around old version of hdf5 error message

astropy/table/tests/test_info.py | 4 3 + 1 - 0 !
astropy/tests/tests/test_socketblocker.py | 4 2 + 2 - 0 !
astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 4 + 0 - 0 !
astropy/vo/samp/tests/test_standard_profile.py | 2 2 + 0 - 0 !
4 files changed, 11 insertions(+), 3 deletions(-)

 mark all known test failures as xfail. these failures have been
 discussed with upstream.

astropy/utils/compat/numpycompat.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 ensure numpy_lt_1_12 works for beta prerelease.

Pull request: https://github.com/astropy/astropy/pull/5646

astropy/coordinates/angle_utilities.py | 2 1 + 1 - 0 !
astropy/extern/configobj.py | 5 4 + 1 - 0 !
astropy/extern/six.py | 2 1 + 1 - 0 !
astropy/table/jsviewer.py | 14 8 + 6 - 0 !
astropy/table/tests/test_jsviewer.py | 6 3 + 3 - 0 !
astropy/tests/helper.py | 2 1 + 1 - 0 !
astropy/units/format/cds.py | 4 2 + 2 - 0 !
astropy/units/format/generic.py | 4 2 + 2 - 0 !
astropy/units/format/ogip.py | 4 2 + 2 - 0 !
9 files changed, 24 insertions(+), 19 deletions(-)

 use external python modules instead of convenience copies

astropy/tests/runner.py | 7 4 + 3 - 0 !
1 file changed, 4 insertions(+), 3 deletions(-)

 fix default value for remote_data option

Pull request: https://github.com/astropy/astropy/pull/5689

astropy/io/votable/tests/vo_test.py | 5 1 + 4 - 0 !
astropy/units/tests/test_format.py | 466 202 + 264 - 0 !
astropy/wcs/tests/test_profiling.py | 99 38 + 61 - 0 !
astropy/wcs/tests/test_wcs.py | 146 57 + 89 - 0 !
4 files changed, 298 insertions(+), 418 deletions(-)

 use parametrize instead of yield.

Pull request: https://github.com/astropy/astropy/pull/5678
Pull request: https://github.com/astropy/astropy/pull/5682

astropy/tests/pytest_plugins.py | 17 4 + 13 - 0 !
astropy/tests/tests/test_runner.py | 16 9 + 7 - 0 !
setup.cfg | 2 1 + 1 - 0 !
3 files changed, 14 insertions(+), 21 deletions(-)

 allow pytest 3.x to use plugin for doctests in .rst files.

Pull request: https://github.com/astropy/astropy/pull/5688