Skip to content

Commit 1d968a1

Browse files
committed
Prep release
1 parent 5a3a52d commit 1d968a1

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

README.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,10 @@ session using ``--pdb`` or similar.
228228
Changelog
229229
=========
230230

231-
2.1.0
232-
-----
233-
234-
- Increase pytest requirement to >=5.0.0. Thanks Dominic Davis-Foster.
235-
236231
2.0.0
237232
-----
238233

234+
- Increase pytest requirement to >=5.0.0. Thanks Dominic Davis-Foster.
239235
- Use thread timeout method when plugin is not called from main
240236
thread to avoid crash.
241237
- Fix pycharm debugger detection so timeouts are not triggered during

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
name="pytest-timeout",
1010
description="pytest plugin to abort hanging tests",
1111
long_description=long_description,
12-
version="1.4.2",
12+
version="2.0.0",
1313
author="Floris Bruynooghe",
1414
author_email="flub@devork.be",
1515
url="https://github.com/pytest-dev/pytest-timeout",

0 commit comments

Comments
 (0)