runops 2.1.0__tar.gz → 2.1.2__tar.gz

{runops-2.1.0 → runops-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: runops
-Version: 2.1.0
+Version: 2.1.2
 Summary: Run ledger and Slurm job submission for HPC simulation projects
 Project-URL: Homepage, https://github.com/Nkzono99/runops
 Project-URL: Documentation, https://github.com/Nkzono99/runops/blob/main/docs/reference.md

{runops-2.1.0 → runops-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "runops"
-version = "2.1.0"
+version = "2.1.2"
 description = "Run ledger and Slurm job submission for HPC simulation projects"
 readme = "README.md"
 license = "Apache-2.0"

{runops-2.1.0 → runops-2.1.2}/src/runops/__init__.py

@@ -1,3 +1,3 @@
 """runops: run ledger and Slurm job submission for HPC simulation projects."""
 
-__version__ = "2.1.0"
+__version__ = "2.1.2"

{runops-2.1.0 → runops-2.1.2}/src/runops/cli.py

@@ -91,6 +91,19 @@ def _confirm(message: str, yes: bool) -> None:
         raise typer.Exit(1)
 
 
+def _ask_install(root: Path, yes: bool) -> bool:
+    """Ask before creating .venv; default yes. Off a terminal, require -y."""
+    message = (
+        f"Create .venv in {root} and install simulator packages "
+        "(may build simulator binaries and take several minutes)?"
+    )
+    if yes:
+        return True
+    if not sys.stdin.isatty():
+        raise UsageError(f"{message} -- confirmation required; rerun with -y/--yes or --no-install")
+    return bool(typer.confirm(message, default=True))
+
+
 def _resolve(project: Project, refs: list[str]) -> list[Manifest]:
     if not refs:
         raise UsageError("give at least one RUN")
@@ -121,30 +134,26 @@ def init(
     Run from a terminal without arguments, it asks for the site preset and the
     simulators; the site default is guessed from the host name.
     """
-    from runops.ops.setup import SITE_PRESETS, detect_site, hostname, init_project
+    from runops.ops.setup import detect_site, hostname, init_project
 
     sims = sims or []
     root = Path.cwd()
     if not sims and not site and not yes and sys.stdin.isatty():
-        import click
-
-        guessed = detect_site()
-        site = typer.prompt(
-            f"Site preset (guessed from host {hostname()})",
-            default=guessed,
-            type=click.Choice(list(SITE_PRESETS)),
-        )
+        site = _prompt_site(detect_site(), hostname())
         answer = typer.prompt(
             "Simulators, comma-separated (emses, beach, generic; empty for none)",
             default="",
             show_default=False,
         )
         sims = [s.strip() for s in answer.split(",") if s.strip()]
-    if sims and not no_install and any(s.split("=")[0] != "generic" for s in sims):
-        _confirm(f"Create .venv in {root} and install simulator packages?", yes)
-    report = init_project(root, sims, site=site, name=name, install=not no_install)
+    install = not no_install
+    if sims and install and any(s.split("=")[0] != "generic" for s in sims):
+        install = _ask_install(root, yes)
+    report = init_project(root, sims, site=site, name=name, install=install)
     if report.site_detected:
         out.print(f"site: {report.site} (guessed from host {hostname()}; use --site to change)")
+    if not install and not no_install:
+        out.print("packages not installed; ask your agent or run `runo update` later")
     for item in report.created:
         out.print(f"created {item}")
     for spec in report.installed:
@@ -156,6 +165,21 @@ def init(
     )
 
 
+def _prompt_site(guessed: str, host: str) -> str:
+    """Ask for a site preset until a known one (or alias) is given."""
+    from runops.ops.setup import SITE_ALIASES, SITE_PRESETS
+
+    choices = " / ".join(SITE_PRESETS)
+    while True:
+        answer = str(
+            typer.prompt(f"Site preset ({choices}; guessed from host {host})", default=guessed)
+        ).strip()
+        site = SITE_ALIASES.get(answer, answer)
+        if site in SITE_PRESETS:
+            return site
+        err.print(f"[yellow]unknown site preset {answer!r}; choose {choices}[/]")
+
+
 @app.command()
 def doctor(as_json: bool = typer.Option(False, "--json")) -> None:
     """Check configuration, adapters, executables, Slurm and skills."""
@@ -882,12 +906,12 @@ def main(argv: list[str] | None = None) -> None:
     except typer.Abort:
         err.print("aborted")
         sys.exit(1)
-    except Exception as exc:  # click usage errors
-        import click
-
-        if isinstance(exc, click.ClickException):
-            exc.show()
-            sys.exit(2)
+    except Exception as exc:
+        # Usage errors from typer's click (vendored in newer typer, so match by shape).
+        show = getattr(exc, "show", None)
+        if callable(show) and isinstance(getattr(exc, "exit_code", None), int):
+            show()
+            sys.exit(int(exc.exit_code) or 2)  # type: ignore[attr-defined]
         raise
     if isinstance(code, int) and code:
         sys.exit(code)

{runops-2.1.0 → runops-2.1.2}/tests/test_setup_misc.py

@@ -143,3 +143,71 @@ def test_init_not_interactive_with_yes(
     res = cli("init", "-y", "--no-install")
     assert res.code == 0, res.err
     assert load_toml(tmp_path / "runops.toml")["simulators"] == {}
+
+
+def test_init_interactive_reasks_unknown_site(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", _Tty("nowhere\ncamphor\n\n"))
+    res = cli("init", "--no-install")
+    assert res.code == 0, res.err
+    assert "unknown site preset 'nowhere'" in res.err
+    assert load_toml(tmp_path / "runops.toml")["site"]["name"] == "kudpc"
+
+
+def test_usage_error_exit_code(cli) -> None:  # type: ignore[no-untyped-def]
+    res = cli("list", "--no-such-option")
+    assert res.code == 2
+    assert "no-such-option" in res.err
+
+
+def test_cli_does_not_import_click_directly() -> None:
+    source = (Path(__file__).parents[1] / "src/runops/cli.py").read_text()
+    assert "import click" not in source  # newer typer vendors click
+
+
+def test_init_install_prompt_defaults_to_yes(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    calls: list[bool] = []
+
+    def fake_install(project, *, upgrade):  # type: ignore[no-untyped-def]
+        calls.append(upgrade)
+        return ["MPIEMSES3D"], []
+
+    monkeypatch.setattr("runops.ops.setup.install_packages", fake_install)
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(
+        "sys.stdin", _Tty("\nemses\n\n")
+    )  # site: Enter, sims: emses, install: Enter
+    res = cli("init")
+    assert res.code == 0, res.err
+    assert "may build simulator binaries" in res.out
+    assert "[Y/n]" in res.out
+    assert calls == [False]
+    assert "installed MPIEMSES3D" in res.out
+
+
+def test_init_install_declined_keeps_project(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.setattr(
+        "runops.ops.setup.install_packages",
+        lambda project, *, upgrade: (_ for _ in ()).throw(AssertionError("must not install")),
+    )
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", _Tty("\nemses\nn\n"))
+    res = cli("init")
+    assert res.code == 0, res.err
+    assert "runo update" in res.out
+    assert "emses" in load_toml(tmp_path / "runops.toml")["simulators"]
+
+
+def test_init_install_needs_yes_off_terminal(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.chdir(tmp_path)
+    res = cli("init", "emses")
+    assert res.code == 2 and "--yes" in res.err
+    assert not (tmp_path / "runops.toml").exists()

{runops-2.1.0 → runops-2.1.2}/uv.lock

@@ -11,18 +11,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" },
 ]
 
-[[package]]
-name = "click"
-version = "8.3.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "colorama", marker = "sys_platform == 'win32'" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/3d/fa/656b739db8587d7b5dfa22e22ed02566950fbfbcdc20311993483657a5c0/click-8.3.1.tar.gz", hash = "sha256:12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a", size = 295065, upload-time = "2025-11-15T20:45:42.706Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/98/78/01c019cdb5d6498122777c1a43056ebb3ebfeef2076d9d026bfe15583b2b/click-8.3.1-py3-none-any.whl", hash = "sha256:981153a64e25f12d547d3426c367a4857371575ee7ad18df2a6183ab0545b2a6", size = 108274, upload-time = "2025-11-15T20:45:41.139Z" },
-]
-
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -537,7 +525,7 @@ wheels = [
 
 [[package]]
 name = "runops"
-version = "2.1.0"
+version = "2.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },
@@ -661,17 +649,17 @@ wheels = [
 
 [[package]]
 name = "typer"
-version = "0.24.1"
+version = "0.27.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "annotated-doc" },
-    { name = "click" },
+    { name = "colorama", marker = "sys_platform == 'win32'" },
     { name = "rich" },
     { name = "shellingham" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f5/24/cb09efec5cc954f7f9b930bf8279447d24618bb6758d4f6adf2574c41780/typer-0.24.1.tar.gz", hash = "sha256:e39b4732d65fbdcde189ae76cf7cd48aeae72919dea1fdfc16593be016256b45", size = 118613, upload-time = "2026-02-21T16:54:40.609Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/03/51/d33db42cc72ffd8c30777547b42d01f0cbf9d95a770457698d0174b3ed71/typer-0.27.3.tar.gz", hash = "sha256:d0396f770a560ab1b0a8504e13b5f254b728cedb05c61cf0359e944e50ce8901", size = 205303, upload-time = "2026-10-06T17:24:16.61Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4a/91/48db081e7a63bb37284f9fbcefda7c44c277b18b0e13fbc36ea2335b71e6/typer-0.24.1-py3-none-any.whl", hash = "sha256:112c1f0ce578bfb4cab9ffdabc68f031416ebcc216536611ba21f04e9aa84c9e", size = 56085, upload-time = "2026-02-21T16:54:41.616Z" },
+    { url = "https://files.pythonhosted.org/packages/07/ea/2e31b67051e91a133189e9c000c222502ddc6969856416de0d095de4c0b0/typer-0.27.3-py3-none-any.whl", hash = "sha256:e50022f28b82a86313e54501317a1db64bf8f8d036ff8cfe5ca7e47675454aff", size = 123312, upload-time = "2026-10-06T17:24:15.054Z" },
 ]
 
 [[package]]