Merge branch 'mainline' into dependabot/pip/ruff-eq-0.13.star

Author: ttblanchard

.github/workflows/release_publish.yml

@@ -78,12 +78,12 @@ jobs:
           ref: ${{ needs.TagRelease.outputs.tag }}
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.9'
       - name: Install dependencies
         run: |
-          pip install --upgrade hatch
+          pip install --upgrade hatch "click<8.3"
       - name: Build
         run: hatch -v build
       # # See https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-pypi

pipeline/build.sh

@@ -3,7 +3,7 @@
 set -e
 
 pip install --upgrade pip
-pip install --upgrade hatch
+pip install --upgrade hatch "click<8.3"
 pip install --upgrade twine
 hatch run codebuild:lint
 hatch run codebuild:test

requirements-testing.txt

@@ -6,6 +6,6 @@ pytest-timeout == 2.4.*
 pytest-xdist == 3.8.*
 black == 25.*
 ruff == 0.13.*
-mypy == 1.17.*
+mypy == 1.18.*
 psutil == 7.0.*
 types-PyYAML ~= 6.0

src/openjd/adaptor_runtime/process/_logging_subprocess.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import logging
+import shutil
 import signal
 import subprocess
 import uuid
@@ -21,7 +22,11 @@
 
 
 class LoggingSubprocess(object):
-    """A process whose stdout/stderr lines are sent to a configurable logger"""
+    """A process whose stdout/stderr lines are sent to a configurable logger
+
+    Raises:
+         FileNotFoundError: When the executable the adaptor is set to run cannot be found.
+    """
 
     _logger: logging.Logger
     _process: subprocess.Popen
@@ -64,7 +69,27 @@ def __init__(
             # In Windows, this is required for signal. SIGBREAK will be sent to the entire process group.
             # Without this one, current process will also get the SIGBREAK and may react incorrectly.
             popen_params.update(creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)  # type: ignore[attr-defined]
-        self._process = subprocess.Popen(**popen_params)
+
+        try:
+            self._process = subprocess.Popen(**popen_params)
+
+        except FileNotFoundError as fnf_error:
+            # In ManagedProcess we prepend the executable to the list of arguments before creating a LoggingSubprocess
+            executable = args[0]
+            exe_path = shutil.which(executable)
+
+            # If we didn't find the executable found by which
+            if exe_path is not None:
+                raise FileNotFoundError(
+                    f"Could not find executable at: {exe_path} using alias {executable}\n"
+                    f"Error:{fnf_error}"
+                )
+
+            raise FileNotFoundError(
+                f"Could not find the specified command: {executable}\n"
+                f"Ensure the command is available from the PATH environment variable.\n"
+                f"Error:{fnf_error}"
+            )
 
         if not self._process.stdout:  # pragma: no cover
             raise RuntimeError("process stdout not set")

test/openjd/adaptor_runtime/integ/process/test_integration_logging_subprocess.py

@@ -113,9 +113,9 @@ def test_startup_directory(self, startup_dir: str | None, caplog):
     def test_startup_directory_empty_posix(self):
         """When calling LoggingSubprocess with an empty cwd, FileNotFoundError will be raised."""
         args = ["pwd"]
-        with pytest.raises(FileNotFoundError) as excinfo:
+        with pytest.raises(FileNotFoundError) as exc_info:
             LoggingSubprocess(args=args, startup_directory="")
-        assert "[Errno 2] No such file or directory: ''" in str(excinfo.value)
+        assert "[Errno 2] No such file or directory: ''" in str(exc_info.value)
 
     @pytest.mark.skipif(not OSName.is_windows(), reason="Only run this test in Windows.")
     def test_startup_directory_empty_windows(self):
@@ -151,6 +151,13 @@ def test_log_levels(self, log_level: int, caplog):
 
         assert any(r.message == message and r.levelno == _STDERR_LEVEL for r in records)
 
+    def test_executable_not_found(self):
+        """When calling LoggingSubprocess with a missing executable, FileNotFoundError will be raised"""
+        args = ["missing_executable"]
+        with pytest.raises(FileNotFoundError) as exc_info:
+            LoggingSubprocess(args=args)
+        assert "Could not find the specified command" in str(exc_info.value)
+
 
 class TestIntegrationRegexHandler(object):
     """Integration tests for LoggingSubprocess"""