Skip to content

Commit

Permalink
Merge pull request #105 from astrobot/fix-pytest-plugins-import
Browse files Browse the repository at this point in the history
Fix compatibility of conftest.py with Astropy 3.2
  • Loading branch information
dkirkby authored Jan 16, 2020
2 parents f656a04 + c440765 commit 6ea39cc
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion specsim/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,19 @@
# 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 *
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

## Uncomment the following line to treat all DeprecationWarnings as
## exceptions
Expand Down

0 comments on commit 6ea39cc

Please sign in to comment.