Improve GitHubActionsFormatter

tttapa · Aug 20, 2023 · 72c2ed4 · 72c2ed4
1 parent 2cc30e0
commit 72c2ed4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/py_build_cmake/build.py b/src/py_build_cmake/build.py
@@ -282,6 +282,7 @@ def read_all_metadata(
         try:
             update_dynamic_metadata(cfg.standard_metadata, modfile)
         except ImportError as e:
+            logger.error("Error importing %s for reading metadata", str(modfile))
             if hasattr(e, "msg"):
                 e.msg = (
                     "\n"
@@ -293,6 +294,7 @@ def read_all_metadata(
                 )
             raise
         except ProblemInModule as e:
+            logger.error("Error reading metadata from %s", str(modfile))
             e.args = (
                 "\n"
                 "\n"

diff --git a/src/py_build_cmake/common/logformat.py b/src/py_build_cmake/common/logformat.py
@@ -1,4 +1,6 @@
 import logging
+import os
+from pathlib import Path
 
 
 class GitHubActionsFormatter(logging.Formatter):
@@ -9,12 +11,18 @@ def __init__(self):
 
     def format(self, record: logging.LogRecord):
         s = super().format(record)
+        loc = ""
+        if os.environ.get("GITHUB_REPOSITORY", "").endswith("/py-build-cmake"):
+            p = Path(record.pathname)
+            try:
+                i = len(p.parts) - p.parts[-1::-1].index("py_build_cmake") - 1
+                file = Path("src", *p.parts[i:])
+                loc = f" file={file},line={record.lineno}"
+            except ValueError:
+                pass
         prefix = {
-            logging.INFO:
-            "::notice file=%(pathname)s,line=%(lineno)d::" % record.__dict__,
-            logging.WARNING:
-            "::warning file=%(pathname)s,line=%(lineno)d::" % record.__dict__,
-            logging.ERROR:
-            "::error file=%(pathname)s,line=%(lineno)d::" % record.__dict__
+            logging.INFO: f"::notice{loc}::",
+            logging.WARNING: f"::warning{loc}::",
+            logging.ERROR: f"::error{loc}::",
         }.get(record.levelno, record.levelname + ":")
         return prefix + s
diff --git a/src/py_build_cmake/config/load.py b/src/py_build_cmake/config/load.py
@@ -36,13 +36,13 @@ def read_full_config_checked(
         overrides = parse_config_settings_overrides(config_settings, verbose)
         cfg = read_config(pyproject_path, overrides)
     except ConfigError as e:
-        logger.error("Invalid user configuration", exc_info=e)
+        logger.error("Error in user configuration", exc_info=e)
         e.args = (
             "\n" "\n" "\t\u274C Error in user configuration:\n" "\n" f"\t\t{e}\n" "\n",
         )
         raise
     except Exception as e:
-        logger.error("Internal error while processing configuration", exc_info=e)
+        logger.error("Internal error while processing the configuration", exc_info=e)
         e.args = (
             "\n"
             "\n"