ms-env 0.3.0__tar.gz → 0.3.2__tar.gz

{ms_env-0.3.0 → ms_env-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ms_env
-Version: 0.3.0
+Version: 0.3.2
 Summary: Environments for MolSuite apps: find or install external tools, on this machine or over ssh.
 Author: Mario S. Valdés-Tresanco, Mario E. Valdés-Tresanco
 License-Expression: MIT

{ms_env-0.3.0 → ms_env-0.3.2}/docs/guide.md

@@ -177,7 +177,10 @@ ensure(recipe, host).future.result()
 What travels and what is downloaded:
 
 - A package imported from a source checkout goes as a wheel of its code as it
-  is now. The wheel is built once for each state of the code.
+  is now. The wheel is built once for each state of the code and of its last
+  tag, where its version comes from. A checkout that lacks the tag of a release
+  made on the server builds a development version below it, which the host
+  refuses for an app that asks for that release: `git fetch --tags` in it.
 - A package that is installed here is asked for in the version it has.
 - Everything else the host downloads, pinned to the versions of this
   environment, so the two machines may be different systems.

{ms_env-0.3.0 → ms_env-0.3.2}/src/ms_env/app.py

@@ -34,8 +34,21 @@ def _checkout(module: str) -> Path | None:
     return next((parent for parent in origin.parents if (parent / "pyproject.toml").is_file()), None)
 
 
+def _described(root: Path) -> str:
+    """`git describe` of the checkout at `root`: the version of its wheel comes from the last tag,
+    which may change while the code does not. Without git, nothing."""
+    if not (root / ".git").exists():
+        return ""
+    try:
+        return subprocess.run(["git", "-C", str(root), "describe", "--tags", "--long", "--always"],
+                              capture_output=True, text=True, timeout=30, check=False).stdout.strip()
+    except (OSError, subprocess.TimeoutExpired):
+        return ""
+
+
 def _tree_hash(root: Path, module: str) -> str:
-    digest = hashlib.sha256((root / "pyproject.toml").read_bytes())
+    """What the wheel of the checkout depends on: its code and the tag its version comes from."""
+    digest = hashlib.sha256((root / "pyproject.toml").read_bytes() + _described(root).encode())
     package = Path(importlib.util.find_spec(module).origin).resolve().parent
     for path in sorted(package.rglob("*")):
         if path.is_file() and "__pycache__" not in path.parts:

{ms_env-0.3.0 → ms_env-0.3.2}/src/ms_env.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ms_env
-Version: 0.3.0
+Version: 0.3.2
 Summary: Environments for MolSuite apps: find or install external tools, on this machine or over ssh.
 Author: Mario S. Valdés-Tresanco, Mario E. Valdés-Tresanco
 License-Expression: MIT

ms_env-0.3.2/src/ms_env.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.3.2",
+  "distance": 0,
+  "node": "g3f644bbfcaf555dc7cedf971907597ad44ef3f75",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-28"
+}

{ms_env-0.3.0 → ms_env-0.3.2}/tests/test_ms_env.py

@@ -1,6 +1,7 @@
 """Tool recipes: TOML binding, lookup order, env bootstrap script, project-less installs, whose a prefix is."""
 from __future__ import annotations
 
+import subprocess
 import dataclasses
 import json
 import sys
@@ -325,3 +326,20 @@ def test_windows_layout_and_platform_names():
     assert tools.conda_platform("Windows", "AMD64") == "win-64"
     assert tools.conda_platform("Darwin", "arm64") == "osx-arm64"
     assert tools.conda_platform("Linux", "x86_64") == "linux-64" == Host().platform() or sys.platform != "linux"
+
+
+def test_a_new_tag_on_the_same_code_builds_a_new_wheel(tmp_path):
+    from ms_env import app
+
+    def git(*words):
+        subprocess.run(["git", "-C", str(tmp_path), "-c", "user.name=t", "-c", "user.email=t@t", *words],
+                       check=True, capture_output=True)
+
+    git("init", "-q")
+    git("commit", "-q", "--allow-empty", "-m", "one")
+    git("tag", "v0.1.0")
+    git("commit", "-q", "--allow-empty", "-m", "docs only")
+    before = app._described(tmp_path)
+    git("tag", "v0.2.0")  # a release of the same code: its wheel has another version
+    assert before.startswith("v0.1.0-1-g") and app._described(tmp_path).startswith("v0.2.0-0-g")
+    assert app._described(tmp_path / "not-a-checkout") == ""

ms_env-0.3.0/src/ms_env.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.3.0",
-  "distance": 0,
-  "node": "gdf83d1f895ee2bbc643067d4692195ceb5e9a3b1",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-22"
-}