Merge pull request #1076 from pytest-dev/release-3.6.1

Release 3.6.1
pytest-dev · Apr 28, 2024 · c143230 · c143230
2 parents b397288 + 4dd2978
commit c143230
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,16 @@
+pytest-xdist 3.6.1 (2024-04-28)
+===============================
+
+Bug Fixes
+---------
+
+- `#1071 <https://github.com/pytest-dev/pytest-xdist/issues/1071>`_: Add backward compatibility for deadlock issue with the ``execnet`` new ``main_thread_only`` "execmodel" triggered when pytest-cov accesses rinfo.
+
 pytest-xdist 3.6.0 (2024-04-19)
 ===============================
 
+This release was YANKED due to a regression fixed in 3.6.1.
+
 Features
 --------
 

diff --git a/changelog/1071.bugfix b/changelog/1071.bugfix