Merge pull request #224 from Daylily-Informatics/codex/fix-version-resolution

build: unify version resolution

Author: iamh2o

daylily_ec/__init__.py

@@ -5,12 +5,9 @@
 ParallelCluster environments for bioinformatics workloads.
 """
 
-try:
-    from importlib.metadata import version
+from daylily_ec.versioning import get_version
 
-    __version__ = version("daylily-ephemeral-cluster")
-except Exception:
-    __version__ = "0.0.0.dev0"
+__version__ = get_version()
 
 from daylily_ec.create import create_cluster
 

daylily_ec/cli.py

@@ -25,6 +25,7 @@
 from cli_core_yo.app import create_app
 from cli_core_yo.runtime import _reset, initialize
 from cli_core_yo.spec import CliSpec, XdgSpec
+from daylily_ec import versioning
 
 # ── App specification ────────────────────────────────────────────────────────
 
@@ -42,6 +43,58 @@
 app = create_app(spec)
 pricing_app = typer.Typer(help="Spot pricing inspection helpers.")
 app.add_typer(pricing_app, name="pricing")
+app.registered_commands[:] = [
+    cmd for cmd in app.registered_commands if cmd.name not in {"version", "info"}
+]
+
+
+def _installed_dist_version(dist_name: str) -> str:
+    try:
+        from importlib.metadata import version
+
+        return version(dist_name)
+    except Exception:
+        return "unknown"
+
+
+@app.command("version")
+def version_command(
+    json: bool = typer.Option(False, "--json", "-j", help="Output as JSON."),
+) -> None:
+    """Show version."""
+    version = versioning.get_version()
+    if json:
+        output.emit_json({"app": spec.app_display_name, "version": version})
+    else:
+        output.print_text(f"{spec.app_display_name} [cyan]{version}[/cyan]")
+
+
+@app.command("info")
+def info_command(
+    json: bool = typer.Option(False, "--json", "-j", help="Output as JSON."),
+) -> None:
+    """Show system info."""
+    xdg_paths = app._cli_core_yo_xdg_paths  # type: ignore[attr-defined]
+    rows: list[tuple[str, str]] = [
+        ("Version", versioning.get_version()),
+        ("Python", sys.version.split()[0]),
+        ("Config Dir", str(xdg_paths.config)),
+        ("Data Dir", str(xdg_paths.data)),
+        ("State Dir", str(xdg_paths.state)),
+        ("Cache Dir", str(xdg_paths.cache)),
+        ("CLI Core", _installed_dist_version("cli-core-yo")),
+    ]
+    for hook in spec.info_hooks:
+        rows.extend(hook())
+
+    if json:
+        output.emit_json({key: value for key, value in rows})
+        return
+
+    output.heading(f"{spec.app_display_name} Info")
+    max_key = max(len(key) for key, _ in rows)
+    for key, value in rows:
+        output.print_text(f"  {key:<{max_key}}  {value}")
 
 
 # ── Root callback (global options) ───────────────────────────────────────────

daylily_ec/resources/__init__.py

@@ -22,20 +22,11 @@
 from typing import Iterable
 
 import importlib.resources as ir
+from daylily_ec import versioning
 
 RES_DIR_ENV = "DAYLILY_EC_RESOURCES_DIR"
 
 
-def _package_version() -> str:
-    try:
-        from importlib.metadata import version
-
-        return version("daylily-ephemeral-cluster")
-    except Exception:
-        # Source-tree or otherwise not installed. Keep path stable but clearly dev.
-        return "dev"
-
-
 def _xdg_config_home() -> Path:
     xdg = os.environ.get("XDG_CONFIG_HOME", "")
     if xdg:
@@ -75,7 +66,7 @@ def ensure_extracted() -> Path:
         _validate_resources_dir(root)
         return root
 
-    version = _package_version()
+    version = versioning.get_version()
     dest = _xdg_config_home() / "daylily" / "resources" / version
     marker = dest / ".complete"
 
@@ -132,4 +123,3 @@ def resource_path(rel_path: str) -> Path:
             f"Override with {RES_DIR_ENV} if needed."
         )
     return p
-

daylily_ec/versioning.py

@@ -0,0 +1,57 @@
+"""Shared version resolution helpers for source checkouts and installed dists."""
+
+from __future__ import annotations
+
+from functools import lru_cache
+from pathlib import Path
+
+DIST_NAME = "daylily-ephemeral-cluster"
+
+
+def _repo_root() -> Path:
+    return Path(__file__).resolve().parents[1]
+
+
+def _source_tree_version() -> str | None:
+    root = _repo_root()
+    if not (root / ".git").exists():
+        return None
+
+    try:
+        from setuptools_scm import get_version as scm_get_version
+    except Exception:
+        return None
+
+    try:
+        return scm_get_version(
+            root=str(root),
+            relative_to=__file__,
+            version_scheme="guess-next-dev",
+            local_scheme="node-and-date",
+            fallback_version="0.0.0.dev0",
+        )
+    except Exception:
+        return None
+
+
+def _installed_version(dist_name: str = DIST_NAME) -> str | None:
+    try:
+        from importlib.metadata import version
+
+        return version(dist_name)
+    except Exception:
+        return None
+
+
+@lru_cache(maxsize=1)
+def get_version() -> str:
+    """Return the best available version string for the current execution context."""
+    version = _source_tree_version()
+    if version:
+        return version
+
+    version = _installed_version()
+    if version:
+        return version
+
+    return "0.0.0.dev0"

setup.py

@@ -12,8 +12,6 @@
 
 setup(
     name="daylily-ephemeral-cluster",
-    use_scm_version=True,            # derive from tags
-    setup_requires=["setuptools_scm"],
     packages=find_packages(),
     include_package_data=True,
     scripts=script_files,

tests/test_versioning.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+from typer.testing import CliRunner
+
+from daylily_ec import versioning
+from daylily_ec.cli import app
+from daylily_ec.resources import ensure_extracted
+
+runner = CliRunner()
+
+
+def test_get_version_prefers_source_tree(monkeypatch):
+    versioning.get_version.cache_clear()
+    monkeypatch.setattr(versioning, "_source_tree_version", lambda: "1.2.3")
+    monkeypatch.setattr(versioning, "_installed_version", lambda dist_name=versioning.DIST_NAME: "9.9.9")
+
+    assert versioning.get_version() == "1.2.3"
+
+
+def test_get_version_falls_back_to_installed_metadata(monkeypatch):
+    versioning.get_version.cache_clear()
+    monkeypatch.setattr(versioning, "_source_tree_version", lambda: None)
+    monkeypatch.setattr(versioning, "_installed_version", lambda dist_name=versioning.DIST_NAME: "2.3.4")
+
+    assert versioning.get_version() == "2.3.4"
+
+
+def test_cli_version_uses_shared_version_resolver(monkeypatch):
+    versioning.get_version.cache_clear()
+    monkeypatch.setattr(versioning, "get_version", lambda: "3.4.5")
+
+    result = runner.invoke(app, ["version"])
+
+    assert result.exit_code == 0
+    assert "3.4.5" in result.stdout
+
+
+def test_cli_info_uses_shared_version_resolver(monkeypatch):
+    versioning.get_version.cache_clear()
+    monkeypatch.setattr(versioning, "get_version", lambda: "4.5.6")
+
+    result = runner.invoke(app, ["info"])
+
+    assert result.exit_code == 0
+    assert "4.5.6" in result.stdout
+
+
+def test_resources_dir_uses_shared_version_resolver(tmp_path, monkeypatch):
+    versioning.get_version.cache_clear()
+    monkeypatch.setattr(versioning, "get_version", lambda: "5.6.7")
+    monkeypatch.delenv("DAYLILY_EC_RESOURCES_DIR", raising=False)
+    monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "xdg"))
+
+    root = ensure_extracted()
+
+    assert root.name == "5.6.7"