From 113bf901f2f1aa9d7e606666fd97588d579baeb7 Mon Sep 17 00:00:00 2001
From: richardsheridan <richard.sheridan@gmail.com>
Date: Sat, 4 Nov 2023 21:09:49 -0400
Subject: [PATCH] merge newsfragments (#390)

---
 docs/source/history.rst       | 15 +++++++++++++++
 newsfragments/380.bugfix.rst  |  1 -
 newsfragments/389.removal.rst |  1 -
 3 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 newsfragments/380.bugfix.rst
 delete mode 100644 newsfragments/389.removal.rst

diff --git a/docs/source/history.rst b/docs/source/history.rst
index 6645d55e..74cc22a1 100644
--- a/docs/source/history.rst
+++ b/docs/source/history.rst
@@ -5,6 +5,21 @@ Release history
 
 .. towncrier release notes start
 
+trio-parallel 1.2.1 (2023-11-04)
+--------------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Resolved a deprecation warning on python 3.12. (`#380 <https://github.com/richardsheridan/trio-parallel/issues/380>`__)
+
+
+Deprecations and Removals
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Although python 3.7 has not been specifically broken, it is no longer tested in CI. (`#389 <https://github.com/richardsheridan/trio-parallel/issues/389>`__)
+
+
 trio-parallel 1.2.0 (2022-10-29)
 --------------------------------
 
diff --git a/newsfragments/380.bugfix.rst b/newsfragments/380.bugfix.rst
deleted file mode 100644
index 1e87ab86..00000000
--- a/newsfragments/380.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Resolved a deprecation warning on python 3.12.
diff --git a/newsfragments/389.removal.rst b/newsfragments/389.removal.rst
deleted file mode 100644
index 19b7046b..00000000
--- a/newsfragments/389.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Although python 3.7 has not been specifically broken, it is no longer tested in CI.