From f87d035fe457b58f740b3c1b7724713bd68f1299 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 3 Feb 2022 11:48:55 +0100 Subject: [PATCH] [7.0.x] releasing: Always set doc_version --- scripts/prepare-release-pr.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/prepare-release-pr.py b/scripts/prepare-release-pr.py index 73088397d55..fcfd85b20cc 100644 --- a/scripts/prepare-release-pr.py +++ b/scripts/prepare-release-pr.py @@ -90,13 +90,10 @@ def prepare_release_pr( if prerelease: template_name = "release.pre.rst" - doc_version = release_branch elif is_feature_release: template_name = "release.minor.rst" - doc_version = "" # unused in template else: template_name = "release.patch.rst" - doc_version = "" # unused in template # important to use tox here because we have changed branches, so dependencies # might have changed as well @@ -107,7 +104,7 @@ def prepare_release_pr( "--", version, template_name, - doc_version, + release_branch, # doc_version "--skip-check-links", ] print("Running", " ".join(cmdline))