Switch to python -m

Author: cidrblock

Diff for: src/ansible_dev_environment/utils.py

@@ -11,14 +11,14 @@
 import time
 
 from dataclasses import dataclass
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import subprocess_tee
 import yaml
 
 
 if TYPE_CHECKING:
+    from pathlib import Path
     from types import TracebackType
 
     from .config import Config
@@ -280,25 +280,15 @@ def collect_manifests(  # noqa: C901
 def builder_introspect(config: Config, output: Output) -> None:
     """Introspect a collection.
 
-    Default to the path of ansible-builder adjacent to the python executable.
-    Since ansible-builder is a dependency of ade, it should be in the same bin directory
-    as the python interpreter that spawned the ade process.
-    If not found, we cannot introspect.
+    Use the sys executable to run builder, since it is a direct dependency
+    it should be accessible to the current interpreter.
 
     Args:
         config: The configuration object.
         output: The output object.
     """
-    builder_path = Path(sys.executable).parent / "ansible-builder"
-    if not builder_path.exists():
-        output.critical(
-            "Failed to find ansible-builder. Please check the installation"
-            " of ade as it should have been installed by default.",
-        )
-        return  # pragma: no cover
-
     command = (
-        f"{builder_path} introspect {config.site_pkg_path}"
+        f"{sys.executable} -m ansible_builder introspect {config.site_pkg_path}"
         f" --write-pip {config.discovered_python_reqs}"
         f" --write-bindep {config.discovered_bindep_reqs}"
         " --sanitize"
@@ -329,7 +319,7 @@ def builder_introspect(config: Config, output: Output) -> None:
         )
     except subprocess.CalledProcessError as exc:
         err = f"Failed to discover requirements: {exc} {exc.stderr}"
-        logger.critical(err)
+        output.critical(err)
 
     if not config.discovered_python_reqs.exists():
         config.discovered_python_reqs.touch()

Diff for: tests/unit/test_utils.py

@@ -163,33 +163,3 @@ def cache_dir(_self: Config) -> Path:
 
     assert cfg.discovered_bindep_reqs.exists() is True
     assert cfg.discovered_python_reqs.exists() is True
-
-
-def test_builder_not_found(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Test builder not found raises a system exit.
-
-    Args:
-        monkeypatch: The pytest Monkeypatch fixture
-
-    Raises:
-        AssertionError: When the exit code is not 1
-    """
-
-    def exists(_self: Path) -> bool:
-        """Mock path exists.
-
-        Args:
-            _self: The path object
-
-        Returns:
-            False indicating the path does not exist
-
-        """
-        return False
-
-    monkeypatch.setattr(Path, "exists", exists)
-
-    with pytest.raises(SystemExit) as exc_info:
-        builder_introspect(config, output)
-
-    assert exc_info.value.code == 1