saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 01:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix draft argument

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-01-24 13:53:46 -07:00 • committed by Megan Wilhite
parent 2a7fa2775d
commit f4a572b603
2 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements/static/ci/docs.in
View file

@ -1,2 +1,2 @@
sphinx>=3.5.1 sphinx>=4.1.2
jinja2<3.1 jinja2<3.1

33
tools/changelog.py
View file

@ -28,6 +28,7 @@ def changelog(version):
proc = subprocess.run( proc = subprocess.run(
["towncrier", "build", "--draft", f"--version={version}"], ["towncrier", "build", "--draft", f"--version={version}"],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
check=True, check=True,
) )
return proc.stdout.decode() return proc.stdout.decode()
@ -111,20 +112,13 @@ def version():
"default": None, "default": None,
}, },
"draft": { "draft": {
"help": ("Do not make any changes, instead output what would be changed."), "help": "Do not make any changes, instead output what would be changed.",
"type": "bool",
"default": False,
}, },
}, },
) )
def update_rpm(ctx: Context, salt_version: str, draft: bool): def update_rpm(ctx: Context, salt_version: str, draft: bool = False):
if salt_version is None: if salt_version is None:
salt_version = version() salt_version = version()
proc = subprocess.run(
["towncrier", "build", "--draft", f"--version={salt_version}"],
stdout=subprocess.PIPE,
check=True,
)
changes = pkg_changelog(salt_version) changes = pkg_changelog(salt_version)
proc = subprocess.run( proc = subprocess.run(
["sed", f"s/Version: .*/Version: {salt_version}/g", "pkg/rpm/salt.spec"], ["sed", f"s/Version: .*/Version: {salt_version}/g", "pkg/rpm/salt.spec"],
@ -167,13 +161,11 @@ def update_rpm(ctx: Context, salt_version: str, draft: bool):
"default": None, "default": None,
}, },
"draft": { "draft": {
"help": ("Do not make any changes, instead output what would be changed."), "help": "Do not make any changes, instead output what would be changed.",
"type": "bool",
"default": False,
}, },
}, },
) )
def update_deb(ctx: Context, salt_version: str, draft: bool): def update_deb(ctx: Context, salt_version: str, draft: bool = False):
if salt_version is None: if salt_version is None:
salt_version = version() salt_version = version()
changes = pkg_changelog(salt_version) changes = pkg_changelog(salt_version)
@ -212,13 +204,11 @@ def update_deb(ctx: Context, salt_version: str, draft: bool):
"default": None, "default": None,
}, },
"draft": { "draft": {
"help": ("Do not make any changes, instead output what would be changed."), "help": "Do not make any changes, instead output what would be changed.",
"type": "bool",
"default": False,
}, },
}, },
) )
def update_release_notes(ctx: Context, salt_version: str, draft: bool): def update_release_notes(ctx: Context, salt_version: str, draft: bool = False):
if salt_version is None: if salt_version is None:
salt_version = version() salt_version = version()
if "+" in salt_version: if "+" in salt_version:
@ -259,16 +249,11 @@ def update_release_notes(ctx: Context, salt_version: str, draft: bool):
"default": None, "default": None,
}, },
"draft": { "draft": {
"help": ( "help": "Do not make any changes, instead output what would be changed.",
"The draft option determines if we should remove the fragment "
"files from the changelog directory"
),
"type": "bool",
"default": True,
}, },
}, },
) )
def generate_changelog_md(ctx: Context, salt_version: str, draft: bool): def generate_changelog_md(ctx: Context, salt_version: str, draft: bool = False):
if salt_version is None: if salt_version is None:
salt_version = version() salt_version = version()
cmd = ["towncrier", "build", "--version={version}"] cmd = ["towncrier", "build", "--version={version}"]