From c8bbc03e49d5a53b5da808c7328e8f3ad6ed2d7e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 10 Dec 2021 08:18:22 -0300
Subject: [PATCH] Release 2.5.0

---
 CHANGELOG.rst             | 21 +++++++++++++++++++++
 changelog/708.trivial.rst |  1 -
 changelog/719.trivial.rst |  1 -
 changelog/720.trivial.rst |  1 -
 changelog/721.trivial.rst |  1 -
 changelog/722.feature.rst |  1 -
 changelog/733.feature.rst |  1 -
 7 files changed, 21 insertions(+), 6 deletions(-)
 delete mode 100644 changelog/708.trivial.rst
 delete mode 100644 changelog/719.trivial.rst
 delete mode 100644 changelog/720.trivial.rst
 delete mode 100644 changelog/721.trivial.rst
 delete mode 100644 changelog/722.feature.rst
 delete mode 100644 changelog/733.feature.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e302e06..452dd68 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,24 @@
+pytest-xdist 2.5.0 (2021-12-10)
+Features
+--------
+
+- `#722 <https://github.com/pytest-dev/pytest-xdist/issues/722>`_: Full compatibility with pytest 7 - no deprecation warnings or use of legacy features.
+
+- `#733 <https://github.com/pytest-dev/pytest-xdist/issues/733>`_: New ``--dist=loadgroup`` option, which ensures all tests marked with ``@pytest.mark.xdist_group`` run in the same session/worker. Other tests run distributed as in ``--dist=load``.
+
+
+Trivial Changes
+---------------
+
+- `#708 <https://github.com/pytest-dev/pytest-xdist/issues/708>`_: Use ``@pytest.hookspec`` decorator to declare hook options in ``newhooks.py`` to avoid warnings in ``pytest 7.0``.
+
+- `#719 <https://github.com/pytest-dev/pytest-xdist/issues/719>`_: Use up-to-date ``setup.cfg``/``pyproject.toml`` packaging setup.
+
+- `#720 <https://github.com/pytest-dev/pytest-xdist/issues/720>`_: Require pytest>=6.2.0.
+
+- `#721 <https://github.com/pytest-dev/pytest-xdist/issues/721>`_: Started using type annotations and mypy checking internally. The types are incomplete and not published.
+
+
 pytest-xdist 2.4.0 (2021-09-20)
 ===============================
 
diff --git a/changelog/708.trivial.rst b/changelog/708.trivial.rst
deleted file mode 100644
index 38b4176..0000000
--- a/changelog/708.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use ``@pytest.hookspec`` decorator to declare hook options in ``newhooks.py`` to avoid warnings in ``pytest 7.0``.
diff --git a/changelog/719.trivial.rst b/changelog/719.trivial.rst
deleted file mode 100644
index 8fdb3b6..0000000
--- a/changelog/719.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use up-to-date ``setup.cfg``/``pyproject.toml`` packaging setup.
diff --git a/changelog/720.trivial.rst b/changelog/720.trivial.rst
deleted file mode 100644
index ee671cb..0000000
--- a/changelog/720.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Require pytest>=6.2.0.
diff --git a/changelog/721.trivial.rst b/changelog/721.trivial.rst
deleted file mode 100644
index 1c32376..0000000
--- a/changelog/721.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Started using type annotations and mypy checking internally. The types are incomplete and not published.
diff --git a/changelog/722.feature.rst b/changelog/722.feature.rst
deleted file mode 100644
index b8654ff..0000000
--- a/changelog/722.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Full compatibility with pytest 7 - no deprecation warnings or use of legacy features.
diff --git a/changelog/733.feature.rst b/changelog/733.feature.rst
deleted file mode 100644
index 28163e7..0000000
--- a/changelog/733.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-New ``--dist=loadgroup`` option, which ensures all tests marked with ``@pytest.mark.xdist_group`` run in the same session/worker. Other tests run distributed as in ``--dist=load``.