Merge pull request #701 from nicoddemus/release-2.4.0

CHANGELOG.rst

@@ -1,3 +1,16 @@
+pytest-xdist 2.4.0 (2021-09-20)
+===============================
+
+Features
+--------
+
+- `#696 <https://github.com/pytest-dev/pytest-xdist/issues/696>`_: On Linux, the process title now changes to indicate the current worker state (running/idle).
+
+  Depends on the `setproctitle <https://pypi.org/project/setproctitle/>`__ package, which can be installed with ``pip install pytest-xdist[setproctitle]``.
+
+- `#704 <https://github.com/pytest-dev/pytest-xdist/issues/704>`_: Add support for Python 3.10.
+
+
 pytest-xdist 2.3.0 (2021-06-16)
 ===============================
 

RELEASING.rst

@@ -41,3 +41,5 @@ To publish a new release ``X.Y.Z``, the steps are as follows:
     $ git push git@github.com:pytest-dev/pytest-xdist.git v$VERSION
 
 That will build the package and publish it on ``PyPI`` automatically.
+
+#. Merge the release PR to `master`.

changelog/696.feature.rst

@@ -1,3 +0,0 @@
-On Linux, the process title now changes to indicate the current worker state (running/idle).
-
-Depends on the `setproctitle <https://pypi.org/project/setproctitle/>`__ package, which can be installed with ``pip install pytest-xdist[setproctitle]``.

changelog/704.feature

@@ -1 +0,0 @@
-Add support for Python 3.10.