Skip to content

Commit 10a0cbe

Browse files
authored
Fix hangs when executing pytest (#100)
Fix hangs when executing pytest
2 parents 695bfa3 + 0c13a52 commit 10a0cbe

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
1.6.3 (08-08-2019)
1+
1.7.0 (08-08-2019)
22
------------------
33

44
* `#102 <https://github.com/pytest-dev/execnet/pull/102>`__: Show paths in stack traces
55
generated by ``remote_exec()``.
66

7+
* `#100 <https://github.com/pytest-dev/execnet/pull/100>`__: Fix flaky hangs in ``workerpool.waitall``.
8+
79
1.6.1 (2019-07-22)
810
------------------
911

README.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
.. warning::
2-
3-
execnet is currently not maintained
4-
5-
61
execnet: distributed Python deployment and communication
72
========================================================
83

4+
Important
5+
---------
6+
7+
**execnet currently is in maintenance-only mode, mostly because it is still the backend
8+
of the pytest-xdist plugin. Do not use in new projects.**
9+
910
.. image:: https://img.shields.io/pypi/v/execnet.svg
1011
:target: https://pypi.org/project/execnet/
1112

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ install:
2323

2424
test_script:
2525
- C:\Python37\python -m tox
26+
27+
skip_tags: true

doc/index.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
.. image:: _static/pythonring.png
44
:align: right
55

6+
7+
.. warning::
8+
9+
execnet currently is in maintenance-only mode, mostly because it is still the backend
10+
of the pytest-xdist plugin. Do not use in new projects.
11+
612
Python_ is a mature dynamic language whose interpreters can interact with
713
all major computing platforms today.
814

execnet/multi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ def termkill(termfunc, killfunc):
295295
replylist.append(reply)
296296
for reply in replylist:
297297
reply.get()
298-
workerpool.waitall()
298+
workerpool.waitall(timeout=timeout)
299299

300300

301301
default_group = Group()

0 commit comments

Comments
 (0)