Merge pull request #289 from blink1073/update-check-links-settings

Author: blink1073

jupyter_releaser/lib.py

@@ -55,6 +55,7 @@ def check_links(ignore_glob, ignore_links, cache_file, links_expire):
     cmd = f"{python} -m pytest --noconftest --check-links --check-links-cache "
     cmd += f"--check-links-cache-expire-after {links_expire} "
     cmd += "--disable-warnings --quiet "
+    cmd += "-raXs "
     cmd += f"--check-links-cache-name {cache_dir}/check-release-links "
     # do not run doctests, since they might depend on other state.
     cmd += "-p no:doctest "
@@ -84,14 +85,27 @@ def check_links(ignore_glob, ignore_links, cache_file, links_expire):
         matched = glob(f"**/*{ext}", recursive=True)
         files.extend(m for m in matched if not m in ignored and "node_modules" not in m)
 
+    util.log("Checking files with options:")
+    util.log(cmd)
+
+    fails = 0
     for f in files:
         file_cmd = cmd + f' "{f}"'
         try:
-            util.run(file_cmd, shell=False)
+            util.log(f"\nC{f}...")
+            util.run(file_cmd, shell=False, echo=False)
         except Exception as e:
             # Return code 5 means no tests were run (no links found)
             if e.returncode != 5:
-                util.run(file_cmd + " --lf", shell=False)
+                try:
+                    util.log(f"{f} (second attempt)...")
+                    util.run(file_cmd + " --lf", shell=False, echo=False)
+                except Exception:
+                    fails += 1
+                    if fails == 3:
+                        raise RuntimeError("Found three failed links, bailing")
+    if fails:
+        raise RuntimeError(f"Encountered failures in {fails} file(s)")
 
 
 def draft_changelog(

jupyter_releaser/tee.py

@@ -156,15 +156,6 @@ def run(args: Union[str, List[str]], **kwargs: Any) -> CompletedProcess:
 
     check = kwargs.get("check", False)
 
-    if kwargs.get("echo", False):
-        # This is modified from the default implementation since
-        # we want all output to be interleved on the same stream
-        prefix = "COMMAND"
-        if kwargs.pop("show_cwd", False):
-            prefix += f" (in '{os.getcwd()}')"
-        prefix += ":"
-        print(f"{prefix} {cmd}", file=sys.stderr)
-
     loop = asyncio.get_event_loop()
     result = loop.run_until_complete(_stream_subprocess(cmd, **kwargs))
 

jupyter_releaser/util.py

@@ -54,13 +54,23 @@
 def run(cmd, **kwargs):
     """Run a command as a subprocess and get the output as a string"""
     quiet_error = kwargs.pop("quiet_error", False)
+    show_cwd = kwargs.pop("show_cwd", False)
+    quiet = kwargs.pop("quiet", False)
+    echo = kwargs.pop("echo", False)
+
+    if echo:
+        prefix = "COMMAND"
+        if show_cwd:
+            prefix += f" (in '{os.getcwd()}')"
+        prefix += ":"
+        print(f"{prefix} {cmd}", file=sys.stderr)
+
     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")
-    kwargs.setdefault("echo", True)
     kwargs.setdefault("check", True)
 
     try:
@@ -77,12 +87,11 @@ def run(cmd, **kwargs):
 
 def _run_win(cmd, **kwargs):
     """Run a command as a subprocess and get the output as a string"""
-    kwargs.pop("show_cwd", False)
     quiet = kwargs.pop("quiet", False)
+
     if not quiet:
-        log(f"> {cmd}")
-    else:
         kwargs.setdefault("stderr", PIPE)
+
     kwargs.setdefault("shell", True)
 
     parts = shlex.split(cmd)