File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -218,6 +218,11 @@ session using ```--pdb``` or similar.
218218Changelog
219219=========
220220
221+ 2.1.0
222+ -----
223+
224+ - Increase pytest requirement to >=5.0.0. Thanks Dominic Davis-Foster.
225+
2212262.0.0
222227-----
223228
Original file line number Diff line number Diff line change 1313import threading
1414import traceback
1515from collections import namedtuple
16- from distutils .version import LooseVersion
1716
1817import py
1918import pytest
@@ -394,12 +393,8 @@ def timeout_timer(item, timeout):
394393 try :
395394 capman = item .config .pluginmanager .getplugin ("capturemanager" )
396395 if capman :
397- pytest_version = LooseVersion (pytest .__version__ )
398- if pytest_version >= LooseVersion ("3.7.3" ):
399- capman .suspend_global_capture (item )
400- stdout , stderr = capman .read_global_capture ()
401- else :
402- stdout , stderr = capman .suspend_global_capture (item )
396+ capman .suspend_global_capture (item )
397+ stdout , stderr = capman .read_global_capture ()
403398 else :
404399 stdout , stderr = None , None
405400 write_title ("Timeout" , sep = "+" )
Original file line number Diff line number Diff line change 1616 license = "MIT" ,
1717 py_modules = ["pytest_timeout" ],
1818 entry_points = {"pytest11" : ["timeout = pytest_timeout" ]},
19- install_requires = ["pytest>=3.6 .0" ],
19+ install_requires = ["pytest>=5.0 .0" ],
2020 classifiers = [
2121 "Development Status :: 5 - Production/Stable" ,
2222 "Environment :: Console" ,
You can’t perform that action at this time.
0 commit comments