Several fixes to get the pytest working, and updates to ruff and shellcheck.

Author: jmfernandez

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
         files: \.(yaml|yml)$
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.10
+    rev: v0.15.12
     hooks:
       # Run the linter.
       - id: ruff-check
@@ -44,14 +44,14 @@ repos:
         entry: mypy
         args: [--strict, --show-error-codes, --no-warn-unused-ignores]
   - repo: https://github.com/koalaman/shellcheck-precommit.git
-    rev: v0.10.0
+    rev: v0.11.0
     hooks:
       - id: shellcheck
         #args: [--format,json]
         stages: [manual]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.10
+    rev: v0.15.12
     hooks:
       # Run the formatter.
       - id: ruff-format

treecript/aggregator.py

@@ -100,9 +100,11 @@ def draw_tree(
         if group_by_process_name is not None:
             node_color = list(
                 map(
-                    lambda command: GROUPED_BY_COLOR
-                    if command.startswith(group_by_process_name)
-                    else OTHER_COLOR,
+                    lambda command: (
+                        GROUPED_BY_COLOR
+                        if command.startswith(group_by_process_name)
+                        else OTHER_COLOR
+                    ),
                     pids["command"],
                 )
             )
@@ -169,9 +171,11 @@ def draw_spiral(
         if group_by_process_name is not None:
             node_color = list(
                 map(
-                    lambda command: GROUPED_BY_COLOR
-                    if command.startswith(group_by_process_name)
-                    else OTHER_COLOR,
+                    lambda command: (
+                        GROUPED_BY_COLOR
+                        if command.startswith(group_by_process_name)
+                        else OTHER_COLOR
+                    ),
                     pids["command"],
                 )
             )

treecript/parser.py

@@ -169,9 +169,11 @@ def metrics_parser(
         lambda row: str(row.create_time) + "_" + str(row.PID), axis=1
     )
     pids["parent"] = pids.apply(
-        lambda row: str(row.ppid_create_time) + "_" + str(row.PPID)
-        if not pd.isna(row.PPID)
-        else pd.NA,
+        lambda row: (
+            str(row.ppid_create_time) + "_" + str(row.PPID)
+            if not pd.isna(row.PPID)
+            else pd.NA
+        ),
         axis=1,
     )
 

treecript/tdp_finder.py

@@ -36,9 +36,12 @@
         Union,
     )
 
+    from .common import (
+        CPUInfo,
+    )
+
 from .common import (
     CPU_DETAILS_FILENAME,
-    CPUInfo,
     parse_cpuinfo,
 )