From 2dfc33e412e7523124ec7a5a68bcfdd5f025f82f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:59:15 +0000
Subject: [PATCH] Prepare release 8.2.5

Workflow: Release stage 1 - create release PR (Cylc 8+ only), run: 33
---
 CHANGES.md            | 12 ++++++++++++
 changes.d/5933.fix.md |  1 -
 changes.d/5959.fix.md |  1 -
 changes.d/6011.fix.md |  1 -
 changes.d/6031.fix.md |  1 -
 cylc/flow/__init__.py |  2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 changes.d/5933.fix.md
 delete mode 100644 changes.d/5959.fix.md
 delete mode 100644 changes.d/6011.fix.md
 delete mode 100644 changes.d/6031.fix.md

diff --git a/CHANGES.md b/CHANGES.md
index 6ac7e4d345c..72b1b4723b7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,18 @@ $ towncrier create <PR-number>.<break|feat|fix>.md --content "Short description"
 
 <!-- towncrier release notes start -->
 
+## __cylc-8.2.5 (Released 2024-04-04)__
+
+### 🔧 Fixes
+
+[#5933](https://github.com/cylc/cylc-flow/pull/5933) - Fixed bug in `cylc broadcast` (and the GUI Edit Runtime command) where everything after a `#` character in a setting would be stripped out.
+
+[#5959](https://github.com/cylc/cylc-flow/pull/5959) - Fix an issue where workflow "timeout" events were not fired in all situations when they should have been.
+
+[#6011](https://github.com/cylc/cylc-flow/pull/6011) - Fixed a `cylc vip` bug causing remote re-invocation to fail if using `--workflow-name` option.
+
+[#6031](https://github.com/cylc/cylc-flow/pull/6031) - Fixed workflow-state command and xtrigger for alternate cylc-run directory.
+
 ## __cylc-8.2.4 (Released 2024-01-11)__
 
 ### 🚀 Enhancements
diff --git a/changes.d/5933.fix.md b/changes.d/5933.fix.md
deleted file mode 100644
index 8ba0546c760..00000000000
--- a/changes.d/5933.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed bug in `cylc broadcast` (and the GUI Edit Runtime command) where everything after a `#` character in a setting would be stripped out.
diff --git a/changes.d/5959.fix.md b/changes.d/5959.fix.md
deleted file mode 100644
index f68c9bc4112..00000000000
--- a/changes.d/5959.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue where workflow "timeout" events were not fired in all situations when they should have been.
diff --git a/changes.d/6011.fix.md b/changes.d/6011.fix.md
deleted file mode 100644
index 89260fdb392..00000000000
--- a/changes.d/6011.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a `cylc vip` bug causing remote re-invocation to fail if using `--workflow-name` option.
\ No newline at end of file
diff --git a/changes.d/6031.fix.md b/changes.d/6031.fix.md
deleted file mode 100644
index c2479a55386..00000000000
--- a/changes.d/6031.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed workflow-state command and xtrigger for alternate cylc-run directory.
diff --git a/cylc/flow/__init__.py b/cylc/flow/__init__.py
index 6ff3aa1fac5..746833e96ae 100644
--- a/cylc/flow/__init__.py
+++ b/cylc/flow/__init__.py
@@ -53,7 +53,7 @@ def environ_init():
 
 environ_init()
 
-__version__ = '8.2.5.dev'
+__version__ = '8.2.5'
 
 
 def iter_entry_points(entry_point_name):