Merge pull request #99 from blink1073/quiet-output

Clean up build output

Author: Steven Silvester

.github/actions/check-links/action.yml

@@ -24,7 +24,7 @@ runs:
         # Install Jupyter Releaser from git unless we are testing Releaser itself
         if ! command -v jupyter-releaser &> /dev/null
         then
-            pip install git+https://github.com/jupyter-server/jupyter_releaser.git
+            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git
         fi
 
         jupyter-releaser prep-git

.github/actions/check-release/action.yml

@@ -35,7 +35,7 @@ runs:
         # Install Jupyter Releaser from git unless we are testing Releaser itself
         if ! command -v jupyter-releaser &> /dev/null
         then
-            pip install git+https://github.com/jupyter-server/jupyter_releaser.git
+            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git
         fi
 
         export RH_IS_CHECK_RELEASE=true

jupyter_releaser/actions/draft_release.py

@@ -5,11 +5,13 @@
 from pathlib import Path
 from subprocess import CalledProcessError
 
+from jupyter_releaser.changelog import extract_current
 from jupyter_releaser.util import CHECKOUT_NAME
 from jupyter_releaser.util import get_latest_tag
 from jupyter_releaser.util import log
 from jupyter_releaser.util import run
 
+
 check_release = os.environ.get("RH_IS_CHECK_RELEASE", "").lower() == "true"
 
 if check_release:
@@ -25,9 +27,9 @@
 
     # Re-install jupyter-releaser if it was overshadowed
     try:
-        run("jupyter-releaser --help")
+        run("jupyter-releaser --help", quiet=True, quiet_error=True)
     except CalledProcessError:
-        run("pip install -e .")
+        run("pip install -q -e .")
 
 run("jupyter-releaser prep-git")
 
@@ -36,16 +38,16 @@
 # Do this before bumping the version
 curr_dir = os.getcwd()
 os.chdir(CHECKOUT_NAME)
-os.environ.setdefault("RH_SINCE", get_latest_tag(os.environ["RH_BRANCH"] or ""))
+os.environ.setdefault("RH_SINCE", get_latest_tag(os.environ["RH_BRANCH"]) or "")
 os.chdir(curr_dir)
 
 run("jupyter-releaser bump-version")
 
 if check_release:
     # Override the changelog
     log("Patching the changelog")
-    log(changelog_text)
     Path(changelog_location).write_text(changelog_text)
+    log(extract_current(changelog_location))
 
 run("jupyter-releaser check-changelog")
 

jupyter_releaser/lib.py

@@ -35,7 +35,7 @@ def bump_version(version_spec, version_cmd):
 
     # Bail if tag already exists
     tag_name = f"v{version}"
-    if tag_name in util.run("git --no-pager tag").splitlines():
+    if tag_name in util.run("git --no-pager tag", quiet=True).splitlines():
         msg = f"Tag {tag_name} already exists!"
         msg += " To delete run: `git push --delete origin {tag_name}`"
         raise ValueError(msg)
@@ -49,6 +49,7 @@ def check_links(ignore_glob, ignore_links, cache_file, links_expire):
     os.makedirs(cache_dir, exist_ok=True)
     cmd = "pytest --noconftest --check-links --check-links-cache "
     cmd += f"--check-links-cache-expire-after {links_expire} "
+    cmd += "--disable-warnings --quiet "
     cmd += f"--check-links-cache-name {cache_dir}/check-release-links "
 
     ignored = []
@@ -89,7 +90,7 @@ def draft_changelog(version_spec, branch, repo, since, auth, changelog_path, dry
     branch = branch or util.get_branch()
     version = util.get_version()
 
-    tags = util.run("git --no-pager tag")
+    tags = util.run("git --no-pager tag", quiet=True)
     if f"v{version}" in tags.splitlines():
         raise ValueError(f"Tag v{version} already exists")
 
@@ -470,7 +471,7 @@ def prep_git(ref, branch, repo, auth, username, url, install=True):
     ref = ref or ""
 
     # Make sure we have *all* tags
-    util.run("git fetch origin --tags --force")
+    util.run("git fetch origin --tags --force --quiet")
 
     # Handle the ref
     if ref.startswith("refs/pull/"):
@@ -500,7 +501,7 @@ def prep_git(ref, branch, repo, auth, username, url, install=True):
     if install:
         # install python package in editable mode with test deps
         if util.SETUP_PY.exists():
-            util.run('pip install -e ".[test]"')
+            util.run('pip install -q -e ".[test]"')
 
         # prefer yarn if yarn lock exists
         elif util.YARN_LOCK.exists():
@@ -535,7 +536,7 @@ def forwardport_changelog(
     os.chdir(util.CHECKOUT_NAME)
 
     # Bail if the tag has been merged to the branch
-    tags = util.run(f"git --no-pager tag --merged {branch}")
+    tags = util.run(f"git --no-pager tag --merged {branch}", quiet=True)
     if tag in tags.splitlines():
         util.log(f"Skipping since tag is already merged into {branch}")
         return

jupyter_releaser/python.py

@@ -55,7 +55,7 @@ def check_dist(dist_file, test_cmd=""):
         # Create the virtual env, upgrade pip,
         # install, and run test command
         util.run(f"python -m venv {env_path}")
-        util.run(f"{bin_path}/python -m pip install -U pip")
+        util.run(f"{bin_path}/python -m pip install -q -U pip")
         util.run(f"{bin_path}/pip install -q {dist_file}")
         util.run(f"{bin_path}/{test_cmd}")
 

jupyter_releaser/tests/test_cli.py

@@ -79,7 +79,7 @@ def test_prep_git_full(py_package, tmp_path, mocker, runner):
             call('git config --global user.name "GitHub Action"'),
             call("git init .jupyter_releaser_checkout"),
             call("git remote add origin https://snuffy:[email protected]/baz/bar.git"),
-            call("git fetch origin --tags --force"),
+            call("git fetch origin --tags --force --quiet"),
             call("git fetch origin +refs/pull/42:refs/pull/42"),
             call("git fetch origin refs/pull/42"),
             call("git checkout -B foo refs/pull/42"),

jupyter_releaser/util.py

@@ -47,14 +47,15 @@ def run(cmd, **kwargs):
         return _run_win(cmd, **kwargs)
 
     quiet = kwargs.get("quiet")
+    quiet_error = kwargs.get("quiet_error")
     kwargs.setdefault("echo", True)
     kwargs.setdefault("check", True)
 
     try:
         process = tee(cmd, **kwargs)
         return (process.stdout or "").strip()
     except CalledProcessError as e:
-        if quiet:
+        if quiet and not quiet_error:
             if e.stderr:
                 log("stderr:\n", e.stderr.strip(), "\n\n")
             if e.stdout:
@@ -245,7 +246,7 @@ def actions_output(name, value):
 
 def get_latest_tag(branch):
     """Get the default 'since' value for a branch"""
-    tags = run(f"git --no-pager tag --sort=-creatordate --merged {branch}")
+    tags = run(f"git --no-pager tag --sort=-creatordate --merged {branch}", quiet=True)
     if tags:
         return tags.splitlines()[0]