make more outputs quiet in CI and tests

Author: Steven Silvester

jupyter_releaser/lib.py

@@ -391,7 +391,9 @@ def publish_assets(dist_dir, npm_token, npm_cmd, twine_cmd, dry_run):
         elif suffix == ".tgz":
             # Ignore already published versions
             try:
-                util.run(f"{npm_cmd} {name}", cwd=dist_dir, quiet=True)
+                util.run(
+                    f"{npm_cmd} {name}", cwd=dist_dir, quiet=True, quiet_error=True
+                )
             except CalledProcessError as e:
                 stderr = e.stderr
                 if (

jupyter_releaser/npm.py

@@ -166,14 +166,17 @@ def tag_workspace_packages():
     if "workspaces" not in data:
         return
 
+    skipped = []
     for path in _get_workspace_packages(data):
         sub_package_json = path / "package.json"
         sub_data = json.loads(sub_package_json.read_text(encoding="utf-8"))
         tag_name = f"{sub_data['name']}@{sub_data['version']}"
         if tag_name in tags:
-            util.log(f"Skipping existing tag {tag_name}")
+            skipped.append(tag_name)
         else:
             util.run(f"git tag {tag_name}")
+    if skipped:
+        print(f"\nSkipped existing tags:\n{skipped}\n")
 
 
 def _get_workspace_packages(data):

jupyter_releaser/python.py

@@ -22,14 +22,14 @@ def build_dist(dist_dir):
     # Clean the dist folder of existing npm tarballs
     os.makedirs(dist_dir, exist_ok=True)
     dest = Path(dist_dir)
-    for pkg in glob(f"{dist_dir}/*.gz") + glob(f"{dist_dir}/*.whl"):
+    for pkg in glob(f"{dest}/*.gz") + glob(f"{dest}/*.whl"):
         os.remove(pkg)
 
     if PYPROJECT.exists():
-        util.run(f"python -m build --outdir {dist_dir} .")
+        util.run(f"python -m build --outdir {dest} .", quiet=True)
     elif SETUP_PY.exists():
-        util.run(f"python setup.py sdist --dist-dir {dist_dir}")
-        util.run(f"python setup.py bdist_wheel --dist-dir {dist_dir}")
+        util.run(f"python setup.py sdist --dist-dir {dest}", quiet=True)
+        util.run(f"python setup.py bdist_wheel --dist-dir {dest}", quiet=True)
 
 
 def check_dist(dist_file, test_cmd=""):

jupyter_releaser/tests/conftest.py

@@ -93,7 +93,7 @@ def workspace_package(npm_package):
         new_dir = prev_dir / "packages" / name
         os.makedirs(new_dir)
         os.chdir(new_dir)
-        run("npm init -y")
+        run("npm init -y", quiet=True)
         index = new_dir / "index.js"
         index.write_text('console.log("hello")', encoding="utf-8")
         if name == "foo":
@@ -119,7 +119,7 @@ def py_dist(py_package, runner, mocker, build_mock, git_prep):
     changelog_entry = testutil.mock_changelog_entry(py_package, runner, mocker)
 
     # Create the dist files
-    util.run("python -m build .", cwd=util.CHECKOUT_NAME)
+    util.run("python -m build .", cwd=util.CHECKOUT_NAME, quiet=True)
 
     # Finalize the release
     runner(["tag-release"])

jupyter_releaser/tests/util.py

@@ -146,7 +146,7 @@ def create_npm_package(git_repo):
     run('git commit -m "initial npm package"')
 
     run("git checkout foo")
-    run("git pull origin bar")
+    run("git pull origin bar", quiet=True)
     run("git checkout bar")
     return git_repo
 
@@ -187,7 +187,7 @@ def create_python_package(git_repo):
     run('git commit -m "initial python package"')
 
     run("git checkout foo")
-    run("git pull origin bar")
+    run("git pull origin bar", quiet=True)
     run("git checkout bar")
 
     return git_repo

jupyter_releaser/util.py

@@ -42,13 +42,13 @@
 
 def run(cmd, **kwargs):
     """Run a command as a subprocess and get the output as a string"""
+    quiet_error = kwargs.pop("quiet_error", False)
     if sys.platform.startswith("win"):
         # Async subprocesses do not work well on Windows, use standard
         # subprocess methods
         return _run_win(cmd, **kwargs)
 
     quiet = kwargs.get("quiet")
-    quiet_error = kwargs.get("quiet_error")
     kwargs.setdefault("echo", True)
     kwargs.setdefault("check", True)