From 090676a2bc35d59e20c940e4edb28bc058ccef6a Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 12 Oct 2021 09:22:39 -0300
Subject: [PATCH] Minor adjustments

---
 scripts/prepare-release-pr.py | 18 ++++++++----------
 scripts/release.py            |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/scripts/prepare-release-pr.py b/scripts/prepare-release-pr.py
index 14fbdd7c0..f16e7b962 100644
--- a/scripts/prepare-release-pr.py
+++ b/scripts/prepare-release-pr.py
@@ -58,7 +58,7 @@ def prepare_release_pr(
 
     features = list(changelog.glob("*.feature.rst"))
     breaking = list(changelog.glob("*.breaking.rst"))
-    is_feature_release = features or breaking
+    is_feature_release = bool(features or breaking)
 
     try:
         version = find_next_version(
@@ -68,15 +68,6 @@ def prepare_release_pr(
         print(f"{Fore.RED}{e}")
         raise SystemExit(1)
 
-    template_name = ""
-
-    if prerelease:
-        template_name = "release.pre.rst"
-    elif is_feature_release:
-        template_name = "release.minor.rst"
-    else:
-        template_name = "release.patch.rst"
-
     print(f"Version: {Fore.CYAN}{version}")
 
     release_branch = f"release-{version}"
@@ -97,6 +88,13 @@ def prepare_release_pr(
 
     print(f"Branch {Fore.CYAN}{release_branch}{Fore.RESET} created.")
 
+    if prerelease:
+        template_name = "release.pre.rst"
+    elif is_feature_release:
+        template_name = "release.minor.rst"
+    else:
+        template_name = "release.patch.rst"
+
     # important to use tox here because we have changed branches, so dependencies
     # might have changed as well
     cmdline = [
diff --git a/scripts/release.py b/scripts/release.py
index e9397ad96..27fc68292 100644
--- a/scripts/release.py
+++ b/scripts/release.py
@@ -80,7 +80,7 @@ def check_links():
 
 def pre_release(version, template_name, *, skip_check_links):
     """Generates new docs, release announcements and creates a local tag."""
-    announce(version)
+    announce(version, template_name)
     regen(version)
     changelog(version, write_out=True)
     fix_formatting()