floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[7.0.x] releasing: Always set doc_version (#9590) 

Co-authored-by: Florian Bruhin <me@the-compiler.org>
This commit is contained in:
github-actions[bot] 2022-02-03 11:07:47 +00:00 committed by GitHub
parent b304499925
commit 7fa3972963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/prepare-release-pr.py
View File

@ -90,13 +90,10 @@ def prepare_release_pr(
if prerelease: if prerelease:
template_name = "release.pre.rst" template_name = "release.pre.rst"
doc_version = release_branch
elif is_feature_release: elif is_feature_release:
template_name = "release.minor.rst" template_name = "release.minor.rst"
doc_version = "" # unused in template
else: else:
template_name = "release.patch.rst" template_name = "release.patch.rst"
doc_version = "" # unused in template
# important to use tox here because we have changed branches, so dependencies # important to use tox here because we have changed branches, so dependencies
# might have changed as well # might have changed as well
@ -107,7 +104,7 @@ def prepare_release_pr(
"--", "--",
version, version,
template_name, template_name,
doc_version, release_branch, # doc_version
"--skip-check-links", "--skip-check-links",
] ]
print("Running", " ".join(cmdline)) print("Running", " ".join(cmdline))