Improve output from pip install and build_docs failures

usnistgov · Sep 11, 2023 · 4171511 · 4171511
1 parent dd40f5b
commit 4171511
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/ntd2d/entrypoint.py b/ntd2d/entrypoint.py
@@ -36,7 +36,10 @@ def main():
             requirements = pathlib.Path(requirements)
             if requirements.is_file():
                 gha_utils.debug(f"pip installing", use_subprocess=True)
-                subprocess.check_call(["pip", "install", "-r", requirements.as_posix()])
+                subprocess.run(["pip", "install", "-r", requirements.as_posix()],
+                               bufsize=1,
+                               text=True,
+                               check=True)
 
     # Install any Conda packages requested
     environment = os.environ['INPUT_CONDA-ENVIRONMENT']
@@ -51,14 +54,14 @@ def main():
                                 "--name", "base",
                                 "--solver", "libmamba",
                                 "--file", environment.as_posix()],
-                                bufsize=1,
-                                text=True,
-                                check=True)
+                               bufsize=1,
+                               text=True,
+                               check=True)
                 subprocess.run(["conda", "list",
                                 "--name", "base"],
-                                bufsize=1,
-                                text=True,
-                                check=True)
+                               bufsize=1,
+                               text=True,
+                               check=True)
 
     # Actually NIST the Docs 2 Death
     # This needs to be a subprocess so that it sees packages installed above

diff --git a/ntd2d/ntd2d.py b/ntd2d/ntd2d.py
@@ -56,7 +56,10 @@ def main():
         try:
             main()
         except subprocess.CalledProcessError as e:
-            gha_utils.error(e.stdout.decode('utf-8'), use_subprocess=True)
+            if e.stdout is not None:
+                gha_utils.error(e.stdout.decode('utf-8'), use_subprocess=True)
+            if e.stderr is not None:
+                gha_utils.error(e.stderr.decode('utf-8'), use_subprocess=True)
             raise
     except Exception as e:
         gha_utils.error("".join(traceback.format_exception(e)), use_subprocess=True)