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

Minor adjustments

This commit is contained in:
Bruno Oliveira 2021-10-12 09:22:39 -03:00
parent 5c8159f273
commit 090676a2bc
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ def prepare_release_pr(
features = list(changelog.glob("*.feature.rst")) features = list(changelog.glob("*.feature.rst"))
breaking = list(changelog.glob("*.breaking.rst")) breaking = list(changelog.glob("*.breaking.rst"))
is_feature_release = features or breaking is_feature_release = bool(features or breaking)
try: try:
version = find_next_version( version = find_next_version(
@ -68,15 +68,6 @@ def prepare_release_pr(
print(f"{Fore.RED}{e}") print(f"{Fore.RED}{e}")
raise SystemExit(1) 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}") print(f"Version: {Fore.CYAN}{version}")
release_branch = f"release-{version}" release_branch = f"release-{version}"
@ -97,6 +88,13 @@ def prepare_release_pr(
print(f"Branch {Fore.CYAN}{release_branch}{Fore.RESET} created.") 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 # important to use tox here because we have changed branches, so dependencies
# might have changed as well # might have changed as well
cmdline = [ cmdline = [

2
scripts/release.py
View File

@ -80,7 +80,7 @@ def check_links():
def pre_release(version, template_name, *, skip_check_links): def pre_release(version, template_name, *, skip_check_links):
"""Generates new docs, release announcements and creates a local tag.""" """Generates new docs, release announcements and creates a local tag."""
announce(version) announce(version, template_name)
regen(version) regen(version)
changelog(version, write_out=True) changelog(version, write_out=True)
fix_formatting() fix_formatting()