From f4a572b603b9d11dbc9d3b975bc2306dedb0e821 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@vmware.com>
Date: Tue, 24 Jan 2023 13:53:46 -0700
Subject: [PATCH] Fix draft argument

---
 requirements/static/ci/docs.in |  2 +-
 tools/changelog.py             | 33 +++++++++------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/requirements/static/ci/docs.in b/requirements/static/ci/docs.in
index 65abc52767c..3c3772d524c 100644
--- a/requirements/static/ci/docs.in
+++ b/requirements/static/ci/docs.in
@@ -1,2 +1,2 @@
-sphinx>=3.5.1
+sphinx>=4.1.2
 jinja2<3.1
diff --git a/tools/changelog.py b/tools/changelog.py
index b6eebd16907..d1e4dac86e1 100644
--- a/tools/changelog.py
+++ b/tools/changelog.py
@@ -28,6 +28,7 @@ def changelog(version):
     proc = subprocess.run(
         ["towncrier", "build", "--draft", f"--version={version}"],
         stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
         check=True,
     )
     return proc.stdout.decode()
@@ -111,20 +112,13 @@ def version():
             "default": None,
         },
         "draft": {
-            "help": ("Do not make any changes, instead output what would be changed."),
-            "type": "bool",
-            "default": False,
+            "help": "Do not make any changes, instead output what would be changed.",
         },
     },
 )
-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:
         salt_version = version()
-    proc = subprocess.run(
-        ["towncrier", "build", "--draft", f"--version={salt_version}"],
-        stdout=subprocess.PIPE,
-        check=True,
-    )
     changes = pkg_changelog(salt_version)
     proc = subprocess.run(
         ["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,
         },
         "draft": {
-            "help": ("Do not make any changes, instead output what would be changed."),
-            "type": "bool",
-            "default": False,
+            "help": "Do not make any changes, instead output what would be changed.",
         },
     },
 )
-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:
         salt_version = version()
     changes = pkg_changelog(salt_version)
@@ -212,13 +204,11 @@ def update_deb(ctx: Context, salt_version: str, draft: bool):
             "default": None,
         },
         "draft": {
-            "help": ("Do not make any changes, instead output what would be changed."),
-            "type": "bool",
-            "default": False,
+            "help": "Do not make any changes, instead output what would be changed.",
         },
     },
 )
-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:
         salt_version = version()
     if "+" in salt_version:
@@ -259,16 +249,11 @@ def update_release_notes(ctx: Context, salt_version: str, draft: bool):
             "default": None,
         },
         "draft": {
-            "help": (
-                "The draft option determines if we should remove the fragment "
-                "files from the changelog directory"
-            ),
-            "type": "bool",
-            "default": True,
+            "help": "Do not make any changes, instead output what would be changed.",
         },
     },
 )
-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:
         salt_version = version()
     cmd = ["towncrier", "build", "--version={version}"]