napkinstack 0.9.3__tar.gz → 0.9.5__tar.gz

{napkinstack-0.9.3 → napkinstack-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napkinstack
-Version: 0.9.3
+Version: 0.9.5
 Summary: Engineering framework for several teams and their agents working in one repository: modules, contracts, guardrails in CI.
 License-Expression: MIT
 License-File: LICENSE
@@ -20,7 +20,7 @@ modules, contracts, guardrails in CI. On the Django or Rails model, one command
 the project, which then receives new versions on demand; no application stack is imposed.
 Positioning and vocabulary: [`PRODUCT.md`](PRODUCT.md) §1.
 
-> **Status: v0.9.3, published** on [PyPI](https://pypi.org/project/napkinstack/).
+> **Status: v0.9.5, published** on [PyPI](https://pypi.org/project/napkinstack/).
 > What each version changes, engine and project apart: [`CHANGELOG.md`](CHANGELOG.md).
 > What is open: [`docs/governance/workstreams.md`](docs/governance/workstreams.md).
 
@@ -84,8 +84,8 @@ To try it without installing anything, or to install it from this repository ins
 registry — always pinned to a release tag:
 
 ```bash
-uvx --from "git+https://github.com/NapkinStack/engineering-os@v0.9.3" nstack init my-project
-uv tool install "napkinstack @ git+https://github.com/NapkinStack/engineering-os@v0.9.3"
+uvx --from "git+https://github.com/NapkinStack/engineering-os@v0.9.5" nstack init my-project
+uv tool install "napkinstack @ git+https://github.com/NapkinStack/engineering-os@v0.9.5"
 ```
 
 **Two channels, one published artefact.** The registry publishes: the PyPI artefact of a

{napkinstack-0.9.3 → napkinstack-0.9.5}/README.md

@@ -5,7 +5,7 @@ modules, contracts, guardrails in CI. On the Django or Rails model, one command
 the project, which then receives new versions on demand; no application stack is imposed.
 Positioning and vocabulary: [`PRODUCT.md`](PRODUCT.md) §1.
 
-> **Status: v0.9.3, published** on [PyPI](https://pypi.org/project/napkinstack/).
+> **Status: v0.9.5, published** on [PyPI](https://pypi.org/project/napkinstack/).
 > What each version changes, engine and project apart: [`CHANGELOG.md`](CHANGELOG.md).
 > What is open: [`docs/governance/workstreams.md`](docs/governance/workstreams.md).
 
@@ -69,8 +69,8 @@ To try it without installing anything, or to install it from this repository ins
 registry — always pinned to a release tag:
 
 ```bash
-uvx --from "git+https://github.com/NapkinStack/engineering-os@v0.9.3" nstack init my-project
-uv tool install "napkinstack @ git+https://github.com/NapkinStack/engineering-os@v0.9.3"
+uvx --from "git+https://github.com/NapkinStack/engineering-os@v0.9.5" nstack init my-project
+uv tool install "napkinstack @ git+https://github.com/NapkinStack/engineering-os@v0.9.5"
 ```
 
 **Two channels, one published artefact.** The registry publishes: the PyPI artefact of a

{napkinstack-0.9.3 → napkinstack-0.9.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "napkinstack"
-version = "0.9.3"
+version = "0.9.5"
 description = "Engineering framework for several teams and their agents working in one repository: modules, contracts, guardrails in CI."
 requires-python = ">=3.12"
 license = "MIT"
@@ -27,5 +27,5 @@ dev = ["pytest==9.1.1"]
 required-version = ">=0.12.14,<0.13"
 
 [build-system]
-requires = ["uv_build>=0.12.14,<0.13"]
+requires = ["uv_build>=0.12.14,<0.14"]
 build-backend = "uv_build"

{napkinstack-0.9.3 → napkinstack-0.9.5}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "napkinstack"
-version = "0.9.3"
+version = "0.9.5"
 description = "Engineering framework for several teams and their agents working in one repository: modules, contracts, guardrails in CI."
 requires-python = ">=3.12"
 license = "MIT"
@@ -23,5 +23,5 @@ dev = ["pytest==9.1.1"]
 required-version = ">=0.12.14,<0.13"
 
 [build-system]
-requires = ["uv_build>=0.12.14,<0.13"]
+requires = ["uv_build>=0.12.14,<0.14"]
 build-backend = "uv_build"

{napkinstack-0.9.3 → napkinstack-0.9.5}/src/napkinstack/__init__.py

@@ -1,5 +1,5 @@
 """NapkinStack - engine: fitness functions, skills and module scaffolding."""
 
-from importlib.metadata import version
+from napkinstack.provenance import version
 
-__version__ = version("napkinstack")
+__version__ = version()

{napkinstack-0.9.3 → napkinstack-0.9.5}/src/napkinstack/cli.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import argparse
 import json
+import os
 import sys
 from pathlib import Path
 
@@ -183,8 +184,16 @@ def _run(a) -> int:
     return modules.run_verb(root, "run", a.module, arguments)
 
 
+# What git hands a hook to name its repository (D126): a hook of a linked worktree gets GIT_DIR,
+# and every git the engine runs, in a module or a checkout of its own, would read that one.
+# The engine names its project with --root; git finds the rest from where it runs.
+GIT_LOCATION = ("GIT_DIR", "GIT_WORK_TREE", "GIT_INDEX_FILE", "GIT_COMMON_DIR")
+
+
 def main(argv: list[str] | None = None) -> int:
     argv = sys.argv[1:] if argv is None else argv
+    for name in GIT_LOCATION:
+        os.environ.pop(name, None)
     if late := provenance.behind(_named_root(argv)):
         print(late, file=sys.stderr, flush=True)
     args = build_parser().parse_args(argv)

{napkinstack-0.9.3 → napkinstack-0.9.5}/src/napkinstack/provenance.py

@@ -14,6 +14,7 @@ import importlib.metadata
 import json
 import re
 import subprocess
+import tomllib
 from pathlib import Path
 from urllib.parse import urlparse
 from urllib.request import url2pathname
@@ -24,6 +25,23 @@ ANSWERS = ".copier-answers.yml"
 PUBLISHED = re.compile(r"v\d+\.\d+\.\d+")
 
 
+def version() -> str:
+    """The engine's version. An editable install's metadata is written once, at install, and the
+    checkout moves on: its own pyproject.toml says the version its source is at (D122)."""
+    distribution = importlib.metadata.distribution("napkinstack")
+    try:
+        data = json.loads(distribution.read_text("direct_url.json") or "{}")
+    except json.JSONDecodeError:  # read at import: a damaged record never stops the engine
+        return distribution.version
+    if data.get("dir_info", {}).get("editable"):
+        source = Path(url2pathname(urlparse(data.get("url", "")).path)) / "pyproject.toml"
+        try:
+            return str(tomllib.loads(source.read_text(encoding="utf-8"))["project"]["version"])
+        except (OSError, KeyError, tomllib.TOMLDecodeError):
+            pass
+    return distribution.version
+
+
 def engine() -> tuple[str, str | None]:
     """(version, origin): origin is None for a version installed from the registry."""
     distribution = importlib.metadata.distribution("napkinstack")
@@ -44,7 +62,7 @@ def engine() -> tuple[str, str | None]:
     path = Path(url2pathname(urlparse(data.get("url", "")).path))
     commit = subprocess.run(["git", "describe", "--always", "--dirty"], cwd=path,
                             capture_output=True, text=True).stdout.strip() if path.is_dir() else ""
-    return distribution.version, f"a local checkout at {commit or 'an unknown commit'}"
+    return version(), f"a local checkout at {commit or 'an unknown commit'}"
 
 
 def recorded(root: Path) -> str | None: