From b561916eaf6ec0a8a448ed0bcc90a351ab3c58e3 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@pytest.org>
Date: Mon, 26 May 2025 14:51:07 -0300
Subject: [PATCH] Release 3.7.0

---
 CHANGELOG.rst              | 35 +++++++++++++++++++++++++++++++++++
 changelog/1092.trivial     |  1 -
 changelog/1142.feature.rst |  1 -
 changelog/1144.feature     |  3 ---
 changelog/1162.removal.rst |  1 -
 changelog/1170.feature     |  4 ----
 changelog/1190.trivial.rst |  1 -
 changelog/1200.feature     |  3 ---
 8 files changed, 35 insertions(+), 14 deletions(-)
 delete mode 100644 changelog/1092.trivial
 delete mode 100644 changelog/1142.feature.rst
 delete mode 100644 changelog/1144.feature
 delete mode 100644 changelog/1162.removal.rst
 delete mode 100644 changelog/1170.feature
 delete mode 100644 changelog/1190.trivial.rst
 delete mode 100644 changelog/1200.feature

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2f29201a..c3b0f61b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,38 @@
+pytest-xdist 3.7.0 (2025-05-26)
+===============================
+
+Features
+--------
+
+- `#1142 <https://github.com/pytest-dev/pytest-xdist/issues/1142>`_: Added support for Python 3.13.
+
+- `#1144 <https://github.com/pytest-dev/pytest-xdist/issues/1144>`_: The internal `steal` command is now atomic - it unschedules either all requested tests or none.
+
+  This is a prerequisite for group/scope support in the `worksteal` scheduler, so test groups won't be broken up incorrectly.
+
+- `#1170 <https://github.com/pytest-dev/pytest-xdist/issues/1170>`_: Add the `--px` arg to create proxy gateways.
+
+  Proxy gateways are passed to additional gateways using the `via` keyword.
+  They can serve as a way to run multiple workers on remote machines.
+
+- `#1200 <https://github.com/pytest-dev/pytest-xdist/issues/1200>`_: Now multiple ``xdist_group`` markers are considered when assigning tests to groups (order does not matter).
+
+  Previously, only the last marker would assign a test to a group, but now if a test has multiple ``xdist_group`` marks applied (for example via parametrization or via fixtures), they are merged to make a new group.
+
+
+Removals
+--------
+
+- `#1162 <https://github.com/pytest-dev/pytest-xdist/issues/1162>`_: Dropped support for EOL Python 3.8.
+
+
+Trivial Changes
+---------------
+
+- `#1092 <https://github.com/pytest-dev/pytest-xdist/issues/1092>`_: Update an error message to better indicate where users should go for more information.
+
+- `#1190 <https://github.com/pytest-dev/pytest-xdist/issues/1190>`_: Switched to using a SPDX license identifier introduced in PEP 639.
+
 pytest-xdist 3.6.1 (2024-04-28)
 ===============================
 
diff --git a/changelog/1092.trivial b/changelog/1092.trivial
deleted file mode 100644
index 295c7017..00000000
--- a/changelog/1092.trivial
+++ /dev/null
@@ -1 +0,0 @@
-Update an error message to better indicate where users should go for more information.
diff --git a/changelog/1142.feature.rst b/changelog/1142.feature.rst
deleted file mode 100644
index fa902a30..00000000
--- a/changelog/1142.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added support for Python 3.13.
diff --git a/changelog/1144.feature b/changelog/1144.feature
deleted file mode 100644
index 911d3d00..00000000
--- a/changelog/1144.feature
+++ /dev/null
@@ -1,3 +0,0 @@
-The internal `steal` command is now atomic - it unschedules either all requested tests or none.
-
-This is a prerequisite for group/scope support in the `worksteal` scheduler, so test groups won't be broken up incorrectly.
diff --git a/changelog/1162.removal.rst b/changelog/1162.removal.rst
deleted file mode 100644
index e0b55366..00000000
--- a/changelog/1162.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Dropped support for EOL Python 3.8.
\ No newline at end of file
diff --git a/changelog/1170.feature b/changelog/1170.feature
deleted file mode 100644
index d67e5947..00000000
--- a/changelog/1170.feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Add the `--px` arg to create proxy gateways.
-
-Proxy gateways are passed to additional gateways using the `via` keyword.
-They can serve as a way to run multiple workers on remote machines.
diff --git a/changelog/1190.trivial.rst b/changelog/1190.trivial.rst
deleted file mode 100644
index 78f79127..00000000
--- a/changelog/1190.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Switched to using a SPDX license identifier introduced in PEP 639.
diff --git a/changelog/1200.feature b/changelog/1200.feature
deleted file mode 100644
index 76297589..00000000
--- a/changelog/1200.feature
+++ /dev/null
@@ -1,3 +0,0 @@
-Now multiple ``xdist_group`` markers are considered when assigning tests to groups (order does not matter).
-
-Previously, only the last marker would assign a test to a group, but now if a test has multiple ``xdist_group`` marks applied (for example via parametrization or via fixtures), they are merged to make a new group.