old_contents: # this contains imports plugins that configure py.test for astropy tests.
  # by importing them here in conftest.py they are discoverable by py.test
  # no matter how it is invoked within the source tree.
  
  from astropy.tests.pytest_plugins import *
  
  ## Uncomment the following line to treat all DeprecationWarnings as
  ## exceptions
  # enable_deprecations_as_exceptions()
  
  ## Uncomment and customize the following lines to add/remove entries
  ## from the list of packages for which version numbers are displayed
  ## when running the tests
  # try:
  #     PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
  #     PYTEST_HEADER_MODULES['scikit-image'] = 'skimage'
  #     del PYTEST_HEADER_MODULES['h5py']
  # except NameError:  # needed to support Astropy < 1.0
  #     pass
  
  ## Uncomment the following lines to display the version number of the
  ## package rather than the version number of Astropy in the top line when
  ## running the tests.
  # import os
  #
  ## This is to figure out the affiliated package version, rather than
  ## using Astropy's
  # from . import version
  #
  # try:
  #     packagename = os.path.basename(os.path.dirname(__file__))
  #     TESTED_VERSIONS[packagename] = version.version
  # except NameError:   # Needed to support Astropy <= 1.0.0
  #     pass
  
new_contents: # this contains imports plugins that configure py.test for astropy tests.
  # by importing them here in conftest.py they are discoverable by py.test
  # no matter how it is invoked within the source tree.
  
  try:
      from astropy.tests.plugins.display import (PYTEST_HEADER_MODULES,
                                                 TESTED_VERSIONS)
      from astropy.tests.helper import enable_deprecations_as_exceptions
  except ImportError:
      from astropy.tests.pytest_plugins import (PYTEST_HEADER_MODULES,
                                                enable_deprecations_as_exceptions,
                                                TESTED_VERSIONS)
  
  ## Uncomment the following line to treat all DeprecationWarnings as
  ## exceptions
  # enable_deprecations_as_exceptions()
  
  ## Uncomment and customize the following lines to add/remove entries
  ## from the list of packages for which version numbers are displayed
  ## when running the tests
  # try:
  #     PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
  #     PYTEST_HEADER_MODULES['scikit-image'] = 'skimage'
  #     del PYTEST_HEADER_MODULES['h5py']
  # except NameError:  # needed to support Astropy < 1.0
  #     pass
  
  ## Uncomment the following lines to display the version number of the
  ## package rather than the version number of Astropy in the top line when
  ## running the tests.
  # import os
  #
  ## This is to figure out the affiliated package version, rather than
  ## using Astropy's
  # from . import version
  #
  # try:
  #     packagename = os.path.basename(os.path.dirname(__file__))
  #     TESTED_VERSIONS[packagename] = version.version
  # except NameError:   # Needed to support Astropy <= 1.0.0
  #     pass
  
subject: fix astropy dev failure