Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----

Expand Down
9 changes: 2 additions & 7 deletions pytest_timeout.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import threading
import traceback
from collections import namedtuple
from distutils.version import LooseVersion

import py
import pytest
Expand Down Expand Up @@ -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="+")
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down