From 8bff294b2aaca16fda5a8928ddda041541fa3fc4 Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Mon, 5 Aug 2024 09:56:22 +0900
Subject: [PATCH] Bump version to 0.26.1

---
 docs/source/history.rst       | 15 +++++++++++++++
 newsfragments/2980.misc.rst   |  1 -
 newsfragments/3053.bugfix.rst |  1 -
 src/trio/_version.py          |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 delete mode 100644 newsfragments/2980.misc.rst
 delete mode 100644 newsfragments/3053.bugfix.rst

diff --git a/docs/source/history.rst b/docs/source/history.rst
index 9cef5191e5..a5b407dc78 100644
--- a/docs/source/history.rst
+++ b/docs/source/history.rst
@@ -5,6 +5,21 @@ Release history
 
 .. towncrier release notes start
 
+Trio 0.26.1 (2024-08-05)
+------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Switched ``attrs`` usage off of ``hash``, which is now deprecated. (`#3053 <https://github.com/python-trio/trio/issues/3053>`__)
+
+
+Miscellaneous internal changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Use PyPI's Trusted Publishers to make releases. (`#2980 <https://github.com/python-trio/trio/issues/2980>`__)
+
+
 Trio 0.26.0 (2024-07-05)
 ------------------------
 
diff --git a/newsfragments/2980.misc.rst b/newsfragments/2980.misc.rst
deleted file mode 100644
index ada9c20e45..0000000000
--- a/newsfragments/2980.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use PyPI's Trusted Publishers to make releases.
diff --git a/newsfragments/3053.bugfix.rst b/newsfragments/3053.bugfix.rst
deleted file mode 100644
index 896d5c9173..0000000000
--- a/newsfragments/3053.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Switched ``attrs`` usage off of ``hash``, which is now deprecated.
diff --git a/src/trio/_version.py b/src/trio/_version.py
index b777fa4efe..66c2502f5f 100644
--- a/src/trio/_version.py
+++ b/src/trio/_version.py
@@ -1,3 +1,3 @@
 # This file is imported from __init__.py and parsed by setuptools
 
-__version__ = "0.26.0+dev"
+__version__ = "0.26.1"