diff --git a/README.rst b/README.rst index 03e09cd..75c24ca 100644 --- a/README.rst +++ b/README.rst @@ -218,6 +218,11 @@ session using ```--pdb``` or similar. Changelog ========= +2.1.0 +----- + +- Increase pytest requirement to >=5.0.0. Thanks Dominic Davis-Foster. + 2.0.0 ----- diff --git a/pytest_timeout.py b/pytest_timeout.py index b2b05e6..d420b82 100644 --- a/pytest_timeout.py +++ b/pytest_timeout.py @@ -13,7 +13,6 @@ import threading import traceback from collections import namedtuple -from distutils.version import LooseVersion import py import pytest @@ -394,12 +393,8 @@ def timeout_timer(item, timeout): try: capman = item.config.pluginmanager.getplugin("capturemanager") if capman: - pytest_version = LooseVersion(pytest.__version__) - if pytest_version >= LooseVersion("3.7.3"): - capman.suspend_global_capture(item) - stdout, stderr = capman.read_global_capture() - else: - stdout, stderr = capman.suspend_global_capture(item) + capman.suspend_global_capture(item) + stdout, stderr = capman.read_global_capture() else: stdout, stderr = None, None write_title("Timeout", sep="+") diff --git a/setup.py b/setup.py index 31b5b90..cdbca3a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ license="MIT", py_modules=["pytest_timeout"], entry_points={"pytest11": ["timeout = pytest_timeout"]}, - install_requires=["pytest>=3.6.0"], + install_requires=["pytest>=5.0.0"], classifiers=[ "Development Status :: 5 - Production/Stable", "Environment :: Console",