Conftest cleanup
@@ -5,14 +5,20 @@ import os
# 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.version import version as astropy_version
+
+if astropy_version < '3.0':
+ # With older versions of Astropy, we actually need to import the pytest
+ # plugins themselves in order to make them discoverable by pytest.
+ from astropy.tests.pytest_plugins import *
+else:
+ # As of Astropy 3.0, the pytest plugins provided by Astropy are
+ # automatically made available when Astropy is installed. This means it's
+ # not necessary to import them here, but we still need to import global
+ # variables that are used for configuration.
+ 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)
# Add astropy to test header information and remove unused packages.
# Pytest header customisation was introduced in astropy 1.0.
