From 64f9388f4164e9f64d98a7580933e958ea4a09d5 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@soliv.dev>
Date: Sat, 11 Nov 2023 11:28:31 -0300
Subject: [PATCH 1/2] Add support for Python 3.12

Fix changelog entries from "improvement" to "feature" (there's "improvement" in our towncrier configuration).
---
 .github/workflows/test.yml                         | 6 +++---
 changelog/{963.improvement.rst => 963.feature.rst} | 0
 changelog/965.feature.rst                          | 1 +
 setup.cfg                                          | 1 +
 tox.ini                                            | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename changelog/{963.improvement.rst => 963.feature.rst} (100%)
 create mode 100644 changelog/965.feature.rst

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7288c6f3..fa168266 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,9 +38,9 @@ jobs:
           - "py38-pytestlatest"
           - "py39-pytestlatest"
           - "py310-pytestlatest"
-          - "py310-pytestmain"
           - "py311-pytestlatest"
           - "py311-pytestmain"
+          - "py312-pytestlatest"
           - "py310-psutil"
           - "py310-setproctitle"
 
@@ -54,12 +54,12 @@ jobs:
             python: "3.9"
           - tox_env: "py310-pytestlatest"
             python: "3.10"
-          - tox_env: "py310-pytestmain"
-            python: "3.10"
           - tox_env: "py311-pytestlatest"
             python: "3.11"
           - tox_env: "py311-pytestmain"
             python: "3.11"
+          - tox_env: "py312-pytestlatest"
+            python: "3.12"
           - tox_env: "py310-psutil"
             python: "3.10"
           - tox_env: "py310-setproctitle"
diff --git a/changelog/963.improvement.rst b/changelog/963.feature.rst
similarity index 100%
rename from changelog/963.improvement.rst
rename to changelog/963.feature.rst
diff --git a/changelog/965.feature.rst b/changelog/965.feature.rst
new file mode 100644
index 00000000..5f8aba9b
--- /dev/null
+++ b/changelog/965.feature.rst
@@ -0,0 +1 @@
+Added support for Python 3.12.
diff --git a/setup.cfg b/setup.cfg
index 77346ade..8e420ae8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,6 +30,7 @@ classifiers =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
 license_file = LICENSE
 project_urls =
     Documentation=https://pytest-xdist.readthedocs.io/en/latest
diff --git a/tox.ini b/tox.ini
index b0de6538..ca1310a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist=
   linting
-  py{37,38,39,310,311}-pytestlatest
+  py{37,38,39,310,311,312}-pytestlatest
   py310-pytestmain
   py310-psutil
   py310-setproctitle

From a6b56112f9b686aed7a354e0d50ecc26ad2d9dfe Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@soliv.dev>
Date: Sat, 11 Nov 2023 11:32:15 -0300
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG.rst             | 15 +++++++++++++++
 changelog/963.feature.rst |  5 -----
 changelog/965.feature.rst |  1 -
 3 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 changelog/963.feature.rst
 delete mode 100644 changelog/965.feature.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 23138085..b2ec23eb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+pytest-xdist 3.4.0 (2023-11-11)
+===============================
+
+Features
+--------
+
+- `#963 <https://github.com/pytest-dev/pytest-xdist/issues/963>`_: Wait for workers to finish reporting when test run stops early.
+
+  This makes sure that the results of in-progress tests are displayed.
+  Previously these reports were being discarded, losing information about the
+  test run.
+
+- `#965 <https://github.com/pytest-dev/pytest-xdist/issues/965>`_: Added support for Python 3.12.
+
+
 pytest-xdist 3.3.1 (2023-05-19)
 ===============================
 
diff --git a/changelog/963.feature.rst b/changelog/963.feature.rst
deleted file mode 100644
index 6cf96e24..00000000
--- a/changelog/963.feature.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Wait for workers to finish reporting when test run stops early.
-
-This makes sure that the results of in-progress tests are displayed.
-Previously these reports were being discarded, losing information about the
-test run.
diff --git a/changelog/965.feature.rst b/changelog/965.feature.rst
deleted file mode 100644
index 5f8aba9b..00000000
--- a/changelog/965.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added support for Python 3.12.