From 68dd477c6e06120355813fcafaa35754f7381681 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 18 Apr 2024 17:14:19 +0200
Subject: [PATCH 1/2] MAINT: improper error handling and cleanup.

I just came across that while trying to benchmark docs.

It seem that when this was moved from subprocess.run to spin.util run the
error handling was not updated.

spin.util seem to always return a CompletedProcess and it has the stderr
and return code. (tested locally by changing towncrier to `false`).

While at it I removed unused import and reformatted a tiny bit the
pyprojet.toml to only have 1 command per line for redability.
---
 .spin/cmds.py  | 18 ++++--------------
 pyproject.toml |  6 ++++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.spin/cmds.py b/.spin/cmds.py
index 11e2b1b0e2d3..4c9d7f5beaf0 100644
--- a/.spin/cmds.py
+++ b/.spin/cmds.py
@@ -1,11 +1,7 @@
 import os
 import shutil
-import sys
-import argparse
-import tempfile
 import pathlib
 import shutil
-import json
 import pathlib
 import importlib
 import subprocess
@@ -620,17 +616,11 @@ def notes(ctx, version_override):
         bold=True, fg="bright_yellow"
     )
     # towncrier build --version 2.1 --yes
-    cmd = ["towncrier", "build", "--version", version, "--yes"]
-    try:
-        p = util.run(
-                cmd=cmd,
-                sys_exit=False,
-                output=True,
-                encoding="utf-8"
-            )
-    except subprocess.SubprocessError as e:
+    cmd = ["towncrie", "build", "--version", version, "--yes"]
+    p = util.run(cmd=cmd, sys_exit=False, output=True, encoding="utf-8")
+    if p.returncode != 0:
         raise click.ClickException(
-            f"`towncrier` failed returned {e.returncode} with error `{e.stderr}`"
+            f"`towncrier` failed returned {p.returncode} with error `{p.stderr}`"
         )
 
     output_path = project_config['tool.towncrier.filename'].format(version=version)
diff --git a/pyproject.toml b/pyproject.toml
index 4e069fee8972..b4df3c36d71f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -201,8 +201,10 @@ cli = 'vendored-meson/meson/meson.py'
   ".spin/cmds.py:lint",
 ]
 "Environments" = [
-  "spin.cmds.meson.run", ".spin/cmds.py:ipython",
-  ".spin/cmds.py:python", "spin.cmds.meson.gdb",
+  "spin.cmds.meson.run",
+  ".spin/cmds.py:ipython",
+  ".spin/cmds.py:python",
+  "spin.cmds.meson.gdb",
   "spin.cmds.meson.lldb"
 ]
 "Documentation" = [

From e70799603374352d7fc97118db0000f9907bf01d Mon Sep 17 00:00:00 2001
From: M Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 18 Apr 2024 08:37:06 -0700
Subject: [PATCH 2/2] Update .spin/cmds.py

---
 .spin/cmds.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.spin/cmds.py b/.spin/cmds.py
index 4c9d7f5beaf0..8bcdfe4c64ca 100644
--- a/.spin/cmds.py
+++ b/.spin/cmds.py
@@ -616,7 +616,7 @@ def notes(ctx, version_override):
         bold=True, fg="bright_yellow"
     )
     # towncrier build --version 2.1 --yes
-    cmd = ["towncrie", "build", "--version", version, "--yes"]
+    cmd = ["towncrier", "build", "--version", version, "--yes"]
     p = util.run(cmd=cmd, sys_exit=False, output=True, encoding="utf-8")
     if p.returncode != 0:
         raise click.ClickException(