Added Mac (M-series) support

.github/workflows/test.yaml

@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          # - macos-12
-          # - macos-latest
+          - macos-15-intel
+          - macos-latest
           # - windows-latest
           - ubuntu-latest
         python-version:
@@ -65,7 +65,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip wheel
           python -m pip install --upgrade --upgrade-strategy=eager tox
-          sudo apt-get install -y libjpeg-dev
+
+      - name: Install system dependencies
+        run: sudo apt-get install -y libjpeg-dev
 
       - name: Run tests with coverage
         if: matrix.toxenv == 'py'

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.3.0
     hooks:
       - id: flake8
         additional_dependencies:

pyproject.toml

@@ -8,3 +8,8 @@ build-backend = "setuptools.build_meta"
 
 [tool.versioningit.write]
 file = "src/con_duct/_version.py"
+
+[tool.pytest.ini_options]
+markers = [
+    "flaky: mark a test as being unreliable"
+]

src/con_duct/__main__.py

@@ -11,6 +11,7 @@
 import logging
 import math
 import os
+import platform
 import re
 import shutil
 import signal
@@ -22,13 +23,14 @@
 import threading
 import time
 from types import FrameType
-from typing import IO, Any, Optional, TextIO
+from typing import IO, Any, Callable, Optional, TextIO
 
 __version__ = version("con-duct")
 __schema_version__ = "0.2.2"
 
 
 lgr = logging.getLogger("con-duct")
+SYSTEM = platform.system()
 DEFAULT_LOG_LEVEL = os.environ.get("DUCT_LOG_LEVEL", "INFO").upper()
 
 DUCT_OUTPUT_PREFIX = os.getenv(
@@ -359,6 +361,93 @@ def for_json(self) -> dict[str, Any]:
         return d
 
 
+def _get_sample_linux(session_id: int) -> Sample:
+    sample = Sample()
+
+    ps_command = [
+        "ps",
+        "-w",
+        "-s",
+        str(session_id),
+        "-o",
+        "pid,pcpu,pmem,rss,vsz,etime,stat,cmd",
+    ]
+    output = subprocess.check_output(ps_command, text=True)
+
+    for line in output.splitlines()[1:]:
+        if not line:
+            continue
+
+        pid, pcpu, pmem, rss_kib, vsz_kib, etime, stat, cmd = line.split(maxsplit=7)
+
+        sample.add_pid(
+            pid=int(pid),
+            stats=ProcessStats(
+                pcpu=float(pcpu),
+                pmem=float(pmem),
+                rss=int(rss_kib) * 1024,
+                vsz=int(vsz_kib) * 1024,
+                timestamp=datetime.now().astimezone().isoformat(),
+                etime=etime,
+                stat=Counter([stat]),
+                cmd=cmd,
+            ),
+        )
+    sample.averages = Averages.from_sample(sample=sample)
+    return sample
+
+
+def _get_sample_mac(session_id: int) -> Sample:
+    sample = Sample()
+
+    ps_command = [
+        "ps",
+        "-ax",
+        "-o",
+        "pid,pcpu,pmem,rss,vsz,etime,stat,args",
+    ]
+    output = subprocess.check_output(ps_command, text=True)
+
+    for line in output.splitlines()[1:]:
+        if not line:
+            continue
+
+        pid, pcpu, pmem, rss_kb, vsz_kb, etime, stat, cmd = line.split(maxsplit=7)
+
+        try:
+            sess = os.getsid(int(pid))
+        except Exception as exc:
+            lgr.debug(f"Error fetching session ID for PID {pid}: {str(exc)}")
+            sess = -1
+
+        if sess != session_id:
+            continue
+
+        sample.add_pid(
+            pid=int(pid),
+            stats=ProcessStats(
+                pcpu=float(pcpu),
+                pmem=float(pmem),
+                rss=int(rss_kb) * 1024,
+                vsz=int(vsz_kb) * 1024,
+                timestamp=datetime.now().astimezone().isoformat(),
+                etime=etime,
+                stat=Counter([stat]),
+                cmd=cmd,
+            ),
+        )
+
+    sample.averages = Averages.from_sample(sample=sample)
+    return sample
+
+
+_get_sample_per_system = {
+    "Linux": _get_sample_linux,
+    "Darwin": _get_sample_mac,
+}
+_get_sample: Callable[[int], Sample] = _get_sample_per_system[SYSTEM]
+
+
 class Report:
     """Top level report"""
 
@@ -469,44 +558,14 @@ def get_system_info(self) -> None:
 
     def collect_sample(self) -> Optional[Sample]:
         assert self.session_id is not None
-        sample = Sample()
+
         try:
-            output = subprocess.check_output(
-                [
-                    "ps",
-                    "-w",
-                    "-s",
-                    str(self.session_id),
-                    "-o",
-                    "pid,pcpu,pmem,rss,vsz,etime,stat,cmd",
-                ],
-                text=True,
-            )
-            for line in output.splitlines()[1:]:
-                if line:
-                    pid, pcpu, pmem, rss_kib, vsz_kib, etime, stat, cmd = line.split(
-                        maxsplit=7,
-                    )
-                    sample.add_pid(
-                        int(pid),
-                        ProcessStats(
-                            pcpu=float(pcpu),
-                            pmem=float(pmem),
-                            rss=int(rss_kib) * 1024,
-                            vsz=int(vsz_kib) * 1024,
-                            timestamp=datetime.now().astimezone().isoformat(),
-                            etime=etime,
-                            stat=Counter([stat]),
-                            cmd=cmd,
-                        ),
-                    )
+            sample = _get_sample(session_id=self.session_id)
+            return sample
         except subprocess.CalledProcessError as exc:  # when session_id has no processes
             lgr.debug("Error collecting sample: %s", str(exc))
             return None
 
-        sample.averages = Averages.from_sample(sample)
-        return sample
-
     def update_from_sample(self, sample: Sample) -> None:
         self.full_run_stats = self.full_run_stats.aggregate(sample)
         if self.current_sample is None:

test/test_arg_parsing.py

@@ -1,4 +1,5 @@
 import os
+import platform
 import re
 import subprocess
 from unittest import mock
@@ -27,6 +28,10 @@ def test_con_duct_version() -> None:
     assert re.match(r"con-duct \d+\.\d+\.\d+", output_str)
 
 
+@pytest.mark.skipif(
+    condition=platform.system() != "Linux",
+    reason="Test is specific to Linux platforms.",
+)
 def test_cmd_help() -> None:
     out = subprocess.check_output(["duct", "ps", "--help"])
     assert "ps [options]" in str(out)
@@ -62,7 +67,11 @@ def test_duct_missing_cmd() -> None:
         )
 
 
-def test_abreviation_disabled() -> None:
+@pytest.mark.skipif(
+    condition=platform.system() != "Linux",
+    reason="Test is specific to Linux platforms.",
+)
+def test_abbreviation_disabled() -> None:
     """
     If abbreviation is enabled, options passed to command (not duct) are still
     filtered through the argparse and causes problems.