env-module-manager 0.4.0__tar.gz → 0.5.0__tar.gz

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/.github/workflows/test.yml

@@ -74,3 +74,24 @@ jobs:
 
       - name: Verify artifacts
         run: ls -l dist/
+
+  integration:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: astral-sh/setup-uv@v3
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Test real uv deployment
+        run: uv run pytest tests/test_integration.py -m integration --no-cov

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/.gitignore

@@ -218,6 +218,7 @@ __marimo__/
 
 # Local
 .gitconductor
+/test/
 
 # OS-generated files
 .DS_Store

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env-module-manager
-Version: 0.4.0
+Version: 0.5.0
 Summary: Deploy Python, Rust, shell, and collective CLI environments behind GNU environment modulefiles
 Project-URL: Homepage, https://github.com/ejb90/module-manager
 Project-URL: Documentation, https://module-manager.readthedocs.io/
@@ -50,6 +50,8 @@ It writes tools and modulefiles into predictable versioned locations:
 /prod/modulefiles/<name>/<version>
 ```
 
+The installation prefix and module root must be different directories.
+
 ## Installation
 
 Install from PyPI:

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/README.md

@@ -18,6 +18,8 @@ It writes tools and modulefiles into predictable versioned locations:
 /prod/modulefiles/<name>/<version>
 ```
 
+The installation prefix and module root must be different directories.
+
 ## Installation
 
 Install from PyPI:

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/docs/configuration.md

@@ -20,6 +20,10 @@ find_links = ["/prod/wheels"]
 uv_config_file = "/prod/config/uv.toml"
 ```
 
+`prefix` and `module_root` must resolve to different directories. Using the
+same root makes `<prefix>/<name>/<version>` both an installation directory and
+a modulefile path.
+
 Use a different config file with `--config`:
 
 ```sh

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/docs/development.md

@@ -14,6 +14,14 @@ uv run ruff format --check .
 uv run pytest
 ```
 
+Run the real `uv tool install` integration test with:
+
+```sh
+uv run pytest tests/test_integration.py -m integration --no-cov
+```
+
+CI runs this integration test on Linux and macOS.
+
 Build distributions:
 
 ```sh

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/docs/python-tools.md

@@ -3,6 +3,10 @@
 Python CLIs are installed with `uv tool install`. Each deployed version gets
 isolated `UV_TOOL_DIR` and `UV_TOOL_BIN_DIR` paths.
 
+The install subprocess ignores inherited `UV_TOOL_*` settings so the managed
+destination and install behavior are not changed by the invoking environment.
+Other uv settings, including `UV_CONFIG_FILE`, are preserved.
+
 `uv` is an external runtime requirement for `--execute-install`. It is not a
 Python package dependency because `module-manager` shells out to the `uv`
 executable and is intended to be installable by `uv` itself.

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/module_manager/__init__.py

@@ -1,3 +1,3 @@
 """Deployment helpers for HPC environment module files."""
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/module_manager/cli.py

@@ -250,8 +250,10 @@ def deploy_python(
             `PATH`.
         subprocess.CalledProcessError: If `uv tool install` fails.
     """
-    resolved_module_root = require_path(module_root or config.module_root, "module root", "--module-root")
-    resolved_prefix = require_path(prefix or config.prefix, "install prefix", "--prefix")
+    resolved_module_root, resolved_prefix = require_locations(
+        module_root or config.module_root,
+        prefix or config.prefix,
+    )
     paths = deploy_python_tool(
         name=name,
         version=version,
@@ -319,8 +321,10 @@ def deploy_rust(
     Raises:
         click.UsageError: If required paths are missing.
     """
-    resolved_module_root = require_path(module_root or config.module_root, "module root", "--module-root")
-    resolved_prefix = require_path(prefix or config.prefix, "install prefix", "--prefix")
+    resolved_module_root, resolved_prefix = require_locations(
+        module_root or config.module_root,
+        prefix or config.prefix,
+    )
     paths = deploy_rust_tool(
         name=name,
         version=version,
@@ -387,8 +391,10 @@ def deploy_script(
     Raises:
         click.UsageError: If required paths are missing.
     """
-    resolved_module_root = require_path(module_root or config.module_root, "module root", "--module-root")
-    resolved_prefix = require_path(prefix or config.prefix, "install prefix", "--prefix")
+    resolved_module_root, resolved_prefix = require_locations(
+        module_root or config.module_root,
+        prefix or config.prefix,
+    )
     paths = deploy_script_tool(
         name=name,
         version=version,
@@ -471,12 +477,10 @@ def deploy_env(
     except (OSError, TypeError, tomllib.TOMLDecodeError) as error:
         raise click.ClickException(str(error)) from error
 
-    resolved_module_root = require_path(
+    resolved_module_root, resolved_prefix = require_locations(
         module_root or spec.module_root or config.module_root,
-        "module root",
-        "--module-root",
+        prefix or spec.prefix or config.prefix,
     )
-    resolved_prefix = require_path(prefix or spec.prefix or config.prefix, "install prefix", "--prefix")
     if make_default is not None:
         spec = spec.__class__(
             name=spec.name,
@@ -533,8 +537,10 @@ def uninstall(
     Raises:
         click.UsageError: If required paths are missing.
     """
-    resolved_module_root = require_path(module_root or config.module_root, "module root", "--module-root")
-    resolved_prefix = require_path(prefix or config.prefix, "install prefix", "--prefix")
+    resolved_module_root, resolved_prefix = require_locations(
+        module_root or config.module_root,
+        prefix or config.prefix,
+    )
     result = uninstall_tool(
         name=name,
         version=version,
@@ -569,6 +575,31 @@ def require_path(value: Path | None, label: str, option: str) -> Path:
     return value.expanduser()
 
 
+def require_locations(module_root: Path | None, prefix: Path | None) -> tuple[Path, Path]:
+    """Return distinct configured module and installation roots.
+
+    Args:
+        module_root: Candidate root of the module tree.
+        prefix: Candidate installation prefix.
+
+    Returns:
+        Expanded module root and installation prefix.
+
+    Raises:
+        click.UsageError: If either path is missing or both resolve to the same
+            directory.
+    """
+    resolved_module_root = require_path(module_root, "module root", "--module-root")
+    resolved_prefix = require_path(prefix, "install prefix", "--prefix")
+    if resolved_module_root.resolve() == resolved_prefix.resolve():
+        msg = (
+            "--module-root and --prefix must resolve to different directories; "
+            "otherwise the versioned modulefile collides with the install root."
+        )
+        raise click.UsageError(msg)
+    return resolved_module_root, resolved_prefix
+
+
 def print_result(
     modulefile: Path,
     install_root: Path,

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/module_manager/deploy.py

@@ -178,6 +178,23 @@ def uv_install_command(
     return command
 
 
+def uv_install_environment(tool_dir: Path, bin_dir: Path) -> dict[str, str]:
+    """Build an isolated environment for a managed uv tool installation.
+
+    Args:
+        tool_dir: Directory where uv should store installed tools.
+        bin_dir: Directory where uv should install tool executables.
+
+    Returns:
+        Process environment with inherited `UV_TOOL_*` settings removed and
+        the managed tool destinations set.
+    """
+    env = {key: value for key, value in os.environ.items() if not key.startswith("UV_TOOL_")}
+    env["UV_TOOL_DIR"] = str(tool_dir)
+    env["UV_TOOL_BIN_DIR"] = str(bin_dir)
+    return env
+
+
 def write_text(path: Path, content: str) -> None:
     """Write UTF-8 text to a path, creating parent directories first.
 
@@ -605,9 +622,6 @@ def deploy_environment(
     for tool in spec.tools:
         if tool.tool_type == "python" and tool.package:
             require_executable("uv")
-            env = os.environ.copy()
-            env["UV_TOOL_DIR"] = str(tool_dir)
-            env["UV_TOOL_BIN_DIR"] = str(paths.bin_dir)
             subprocess.run(
                 uv_install_command(
                     tool.package,
@@ -617,7 +631,7 @@ def deploy_environment(
                     tool.uv_config_file,
                 ),
                 check=True,
-                env=env,
+                env=uv_install_environment(tool_dir, paths.bin_dir),
             )
         elif tool.tool_type == "rust" and tool.binary:
             copy_executable(tool.binary, paths.bin_dir / tool.name)
@@ -690,10 +704,7 @@ def deploy_python_tool(
 
     if execute_install:
         require_executable("uv")
-        env = os.environ.copy()
-        env["UV_TOOL_DIR"] = str(tool_dir)
-        env["UV_TOOL_BIN_DIR"] = str(paths.bin_dir)
-        subprocess.run(command, check=True, env=env)
+        subprocess.run(command, check=True, env=uv_install_environment(tool_dir, paths.bin_dir))
 
     install_hint = (
         f"UV_TOOL_DIR={shlex.quote(str(tool_dir))} "

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "env-module-manager"
-version = "0.4.0"
+version = "0.5.0"
 description = "Deploy Python, Rust, shell, and collective CLI environments behind GNU environment modulefiles"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -111,8 +111,13 @@ docstring-code-format = true
 [tool.pytest.ini_options]
 minversion = "7.0"
 pythonpath = ["."]
+markers = [
+    "integration: executes external tools for end-to-end verification",
+]
 addopts = [
     "-ra",
+    "-m",
+    "not integration",
     "--strict-markers",
     "--strict-config",
     "--tb=short",

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/tests/test_cli.py

@@ -105,6 +105,33 @@ uv_config_file = "uv.toml"
     assert "--config-file uv.toml" in modulefile
 
 
+def test_deploy_command_rejects_matching_prefix_and_module_root() -> None:
+    """Deployment roots must differ to avoid a modulefile path collision."""
+    runner = CliRunner()
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            main,
+            [
+                "deploy-python",
+                "gitconductor",
+                "0.7.0",
+                "--package",
+                "gitconductor",
+                "--prefix",
+                "test",
+                "--module-root",
+                "test",
+            ],
+        )
+        collision_path_exists = Path("test/gitconductor/0.7.0").exists()
+
+    assert result.exit_code != 0
+    output = " ".join(strip_ansi(result.output).split())
+    assert "--module-root and --prefix must resolve to different directories" in output
+    assert not collision_path_exists
+
+
 def test_cli_options_override_config_defaults() -> None:
     """CLI options should take precedence over configured defaults."""
     runner = CliRunner()

env_module_manager-0.5.0/tests/test_integration.py

@@ -0,0 +1,49 @@
+"""Integration tests that execute external deployment tools."""
+
+from pathlib import Path
+
+import pytest
+from click.testing import CliRunner
+
+from module_manager.cli import main
+
+
+@pytest.mark.integration
+def test_deploy_python_real_uv_install_uses_cli_roots(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    """A real uv install should use the CLI prefix and module root.
+
+    Args:
+        tmp_path: Temporary deployment root.
+        monkeypatch: Pytest helper used to control inherited uv destinations.
+    """
+    project_root = Path(__file__).parent.parent
+    prefix = tmp_path / "tools"
+    module_root = tmp_path / "modules"
+    inherited_tool_dir = tmp_path / "inherited-tools"
+    inherited_bin_dir = tmp_path / "inherited-bin"
+    monkeypatch.setenv("UV_TOOL_DIR", str(inherited_tool_dir))
+    monkeypatch.setenv("UV_TOOL_BIN_DIR", str(inherited_bin_dir))
+
+    result = CliRunner().invoke(
+        main,
+        [
+            "deploy-python",
+            "module-manager",
+            "0.5.0",
+            "--package",
+            str(project_root),
+            "--prefix",
+            str(prefix),
+            "--module-root",
+            str(module_root),
+            "--execute-install",
+        ],
+    )
+
+    install_root = prefix / "module-manager" / "0.5.0"
+    assert result.exit_code == 0, result.output
+    assert (install_root / "bin" / "module-manager").exists()
+    assert (install_root / "uv-tools" / "env-module-manager" / "uv-receipt.toml").exists()
+    assert (module_root / "module-manager" / "0.5.0").is_file()
+    assert not inherited_tool_dir.exists()
+    assert not inherited_bin_dir.exists()

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/tests/test_modulefile.py

@@ -14,6 +14,7 @@ from module_manager.deploy import (
     require_executable,
     uninstall_tool,
     uv_install_command,
+    uv_install_environment,
 )
 from module_manager.modulefile import (
     ModuleSpec,
@@ -121,6 +122,28 @@ def test_python_tool_install_command_accepts_uv_config_file() -> None:
     ]
 
 
+def test_uv_install_environment_ignores_inherited_uv_tool_settings(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Managed uv installs should ignore inherited tool-specific settings.
+
+    Args:
+        tmp_path: Temporary deployment root.
+        monkeypatch: Pytest helper used to control the process environment.
+    """
+    monkeypatch.setenv("UV_TOOL_DIR", "/inherited/tools")
+    monkeypatch.setenv("UV_TOOL_BIN_DIR", "/inherited/bin")
+    monkeypatch.setenv("UV_TOOL_UPGRADE", "1")
+    monkeypatch.setenv("UV_CONFIG_FILE", "/prod/uv.toml")
+
+    env = uv_install_environment(tmp_path / "tools", tmp_path / "bin")
+
+    assert env["UV_TOOL_DIR"] == str(tmp_path / "tools")
+    assert env["UV_TOOL_BIN_DIR"] == str(tmp_path / "bin")
+    assert "UV_TOOL_UPGRADE" not in env
+    assert env["UV_CONFIG_FILE"] == "/prod/uv.toml"
+
+
 def test_deploy_python_tool_writes_package_sources_to_install_hint(tmp_path: Path) -> None:
     """Generated module help should show the package source options.
 

{env_module_manager-0.4.0 → env_module_manager-0.5.0}/uv.lock

@@ -344,7 +344,7 @@ wheels = [
 
 [[package]]
 name = "env-module-manager"
-version = "0.4.0"
+version = "0.5.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },