From 9e241f804e01d321ee2671085a332029e77eec45 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Fri, 13 Sep 2024 23:39:53 +0100
Subject: [PATCH] update release tooling

---
 .github/workflows/release.yml |  2 +-
 make_release.py               | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 833f9fe..22969db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -105,7 +105,7 @@ jobs:
         path: dist/
 
     - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v1.2.3
+      uses: sigstore/gh-action-sigstore-python@v3.0.0
       with:
         inputs: >-
           ./dist/*.tar.gz
diff --git a/make_release.py b/make_release.py
index 65dbd79..9524140 100644
--- a/make_release.py
+++ b/make_release.py
@@ -121,6 +121,7 @@ def build_release_message(context, commit: bool = False) -> str:
         f"{context['next_version']}"
     )
     message += "\n"
+    message += "\n"
     message += context["changelog_update"]
     return message
 
@@ -202,9 +203,9 @@ def action(self, context):
         self.instruct(
             f"Update change log for version {context['next_version']}"
         )
-        self.system("vi CHANGELOG.md")
+        self.system("vim CHANGELOG.md")
         self.instruct("TEMP: Copy the latest section to the update file")
-        self.system("vi CHANGELOG.md /tmp/changelog_update.md")
+        self.system("vim CHANGELOG.md /tmp/changelog_update.md")
         with open("/tmp/changelog_update.md", "r") as fileobj:
             context["changelog_update"] = fileobj.read()
 
@@ -241,11 +242,6 @@ def action(self, context):
         self.execute("make docs")
 
 
-class MakeMan(Step):
-    def action(self, context):
-        self.execute("make man")
-
-
 class MakeDist(Step):
     def action(self, context):
         self.execute("make dist")
@@ -270,7 +266,7 @@ def action(self, context):
             f"Ensuring that the package has version {context['next_version']}"
         )
         version = self.execute(
-            f"source {context['tmpvenv']}/bin/activate && veld -V",
+            f"source {context['tmpvenv']}/bin/activate && p2r -V",
             silent=True,
             confirm=False,
         )
@@ -379,7 +375,7 @@ def main(target=None):
         ("ci1", WaitForCI()),
         ("bumpversion", BumpVersionPackage()),
         ("clean2", MakeClean()),
-        ("man1", MakeMan()),
+        ("docs", MakeDocs()),
         ("gitadd2", GitAddVersionAndMan()),
         ("gittagpre", GitTagPreRelease()),
         # triggers Github Actions to build dists and push to TestPyPI