compatibility with pytest 4.0, fix #1670

Cf. https://docs.pytest.org/en/latest/deprecations.html#pytest-namespace
This commit is contained in:
Guilhem Saurel 2019-01-23 14:22:39 +01:00 committed by Wenzel Jakob
parent 085a29436a
commit e7ef34f23f

View File

@ -185,7 +185,7 @@ def gc_collect():
gc.collect() gc.collect()
def pytest_namespace(): def pytest_configure():
"""Add import suppression and test requirements to `pytest` namespace""" """Add import suppression and test requirements to `pytest` namespace"""
try: try:
import numpy as np import numpy as np
@ -202,19 +202,17 @@ def pytest_namespace():
pypy = platform.python_implementation() == "PyPy" pypy = platform.python_implementation() == "PyPy"
skipif = pytest.mark.skipif skipif = pytest.mark.skipif
return { pytest.suppress = suppress
'suppress': suppress, pytest.requires_numpy = skipif(not np, reason="numpy is not installed")
'requires_numpy': skipif(not np, reason="numpy is not installed"), pytest.requires_scipy = skipif(not np, reason="scipy is not installed")
'requires_scipy': skipif(not np, reason="scipy is not installed"), pytest.requires_eigen_and_numpy = skipif(not have_eigen or not np,
'requires_eigen_and_numpy': skipif(not have_eigen or not np, reason="eigen and/or numpy are not installed")
reason="eigen and/or numpy are not installed"), pytest.requires_eigen_and_scipy = skipif(
'requires_eigen_and_scipy': skipif(not have_eigen or not scipy, not have_eigen or not scipy, reason="eigen and/or scipy are not installed")
reason="eigen and/or scipy are not installed"), pytest.unsupported_on_pypy = skipif(pypy, reason="unsupported on PyPy")
'unsupported_on_pypy': skipif(pypy, reason="unsupported on PyPy"), pytest.unsupported_on_py2 = skipif(sys.version_info.major < 3,
'unsupported_on_py2': skipif(sys.version_info.major < 3, reason="unsupported on Python 2.x")
reason="unsupported on Python 2.x"), pytest.gc_collect = gc_collect
'gc_collect': gc_collect
}
def _test_import_pybind11(): def _test_import_pybind11():