From 4c46ae7979e90c52a2eab00166661c60fb6e560f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 May 2021 12:09:36 -0400
Subject: [PATCH] Add workaround for #2666.

---
 tools/finalize.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/finalize.py b/tools/finalize.py
index 352942815a..516a2fb564 100644
--- a/tools/finalize.py
+++ b/tools/finalize.py
@@ -46,6 +46,18 @@ def update_changelog():
         '--yes',
     ]
     subprocess.check_call(cmd)
+    _repair_changelog()
+
+
+def _repair_changelog():
+    """
+    Workaround for #2666
+    """
+    changelog_fn = pathlib.Path('CHANGES.rst')
+    changelog = changelog_fn.read_text()
+    fixed = re.sub(r'^(v[0-9.]+)v[0-9.]+$', r'\1', changelog, flags=re.M)
+    changelog_fn.write_text(fixed)
+    subprocess.check_output(['git', 'add', changelog_fn])
 
 
 def bump_version():