calkit-python 0.49.1__py3-none-any.whl → 0.49.2__py3-none-any.whl

calkit/cli/check.py

@@ -2053,7 +2053,7 @@ def check_venv(
             )
         # Last, so an interrupted relock isn't taken as current
         calkit.environments.write_env_spec_hash(
-            lock_fpath, path, python=python, wdir=wdir
+            lock_fpath, spec_hash, wdir=wdir
         )
         # Delete legacy lock file after use
         if used_legacy_lock:

calkit/conda.py

@@ -995,7 +995,7 @@ def check_env(
             relock=spec_changed and recorded_hash is not None,
         )
     # Last, so an interrupted relock isn't taken as current
-    write_env_spec_hash(lock_fpath, env_fpath)
+    write_env_spec_hash(lock_fpath, spec_hash)
     return res
 
 

calkit/environments.py

@@ -1750,7 +1750,7 @@ def env_spec_hash(spec_fpath: str, python: str | None = None) -> str:
     if python is not None:
         content += f"\npython={python}"
     # Named so a reader knows what to check it with
-    return "md5:" + hashlib.md5(content.encode()).hexdigest()
+    return "sha256:" + hashlib.sha256(content.encode()).hexdigest()
 
 
 def _env_spec_hash_key(lock_fpath: str, wdir: str | None) -> str:
@@ -1760,8 +1760,11 @@ def _env_spec_hash_key(lock_fpath: str, wdir: str | None) -> str:
     if lock_dir and os.path.splitext(name)[0] in CONDA_VENV_ARCHS:
         lock_fpath = lock_dir
     if os.path.isabs(lock_fpath):
-        lock_fpath = os.path.relpath(lock_fpath, wdir or ".")
-    return Path(lock_fpath).as_posix()
+        try:
+            lock_fpath = os.path.relpath(lock_fpath, wdir or ".")
+        except ValueError:  # On another Windows drive
+            pass
+    return Path(os.path.normpath(lock_fpath)).as_posix()
 
 
 def read_env_spec_hash(lock_fpath: str, wdir: str | None = None) -> str | None:
@@ -1775,16 +1778,17 @@ def read_env_spec_hash(lock_fpath: str, wdir: str | None = None) -> str | None:
         return None
     if not isinstance(hashes, dict):
         return None
-    return hashes.get(_env_spec_hash_key(lock_fpath, wdir))
+    value = hashes.get(_env_spec_hash_key(lock_fpath, wdir))
+    # Older md5 hashes would make every lock look stale, so they're ignored
+    if isinstance(value, str) and value.startswith("sha256:"):
+        return value
+    return None
 
 
 def write_env_spec_hash(
-    lock_fpath: str,
-    spec_fpath: str,
-    python: str | None = None,
-    wdir: str | None = None,
+    lock_fpath: str, spec_hash: str, wdir: str | None = None
 ) -> None:
-    """Record that a lock was resolved from the spec as it is now.
+    """Record that a lock was resolved from a spec with the given hash.
 
     Kept outside the lock directory, which stages depend on, so recording
     it for a lock that already matches its spec reruns nothing.
@@ -1797,11 +1801,15 @@ def write_env_spec_hash(
         hashes = {}
     if not isinstance(hashes, dict):
         hashes = {}
+    hashes = {
+        k: v
+        for k, v in hashes.items()
+        if isinstance(v, str) and v.startswith("sha256:")
+    }
     key = _env_spec_hash_key(lock_fpath, wdir)
-    value = env_spec_hash(os.path.join(wdir or "", spec_fpath), python=python)
-    if hashes.get(key) == value:
+    if hashes.get(key) == spec_hash:
         return
-    hashes[key] = value
+    hashes[key] = spec_hash
     os.makedirs(os.path.dirname(fpath), exist_ok=True)
     with open(fpath, "w", encoding="utf-8", newline="\n") as f:
         json.dump(hashes, f, indent=2, sort_keys=True)

calkit/tests/test_environments.py

@@ -2055,7 +2055,7 @@ def test_env_spec_hashes(tmp_dir):
     write(lock, "idna==3.10\n")
     # Recorded beside the lock, not in it
     assert envs.read_env_spec_hash(lock) is None
-    envs.write_env_spec_hash(lock, spec)
+    envs.write_env_spec_hash(lock, envs.env_spec_hash(spec))
     assert envs.read_env_spec_hash(lock) == envs.env_spec_hash(spec)
     with open(lock) as f:
         assert f.read() == "idna==3.10\n"
@@ -2094,18 +2094,29 @@ def test_env_spec_hashes(tmp_dir):
     write(os.path.join("sub", spec), "idna\n")
     envs.write_env_spec_hash(
         os.path.join(".calkit", "env-locks", "py", "linux-64.txt"),
-        spec,
+        envs.env_spec_hash(os.path.join("sub", spec)),
         wdir="sub",
     )
     assert envs.read_env_spec_hash(
         os.path.join(".calkit", "env-locks", "py", "win-64.txt"), wdir="sub"
     ) == envs.env_spec_hash(os.path.join("sub", spec))
     with open(os.path.join("sub", envs.ENV_SPEC_HASHES_FPATH)) as f:
-        assert list(json.load(f)) == [".calkit/env-locks/py"]
+        assert json.load(f) == {
+            ".calkit/env-locks/py": envs.env_spec_hash(
+                os.path.join("sub", spec)
+            )
+        }
+    assert envs.env_spec_hash(spec).startswith("sha256:")
+    # Older md5 hashes aren't read, and are dropped on the next write
+    write(envs.ENV_SPEC_HASHES_FPATH, json.dumps({"old": "md5:abc"}))
+    assert envs.read_env_spec_hash("old") is None
+    envs.write_env_spec_hash(lock, envs.env_spec_hash(spec))
+    with open(envs.ENV_SPEC_HASHES_FPATH) as f:
+        assert list(json.load(f)) == [lock]
     # An unreadable file records nothing, and is replaced on the next write
     write(envs.ENV_SPEC_HASHES_FPATH, "not json")
     assert envs.read_env_spec_hash(lock) is None
-    envs.write_env_spec_hash(lock, spec)
+    envs.write_env_spec_hash(lock, envs.env_spec_hash(spec))
     assert envs.read_env_spec_hash(lock) == envs.env_spec_hash(spec)
 
 

{calkit_python-0.49.1.dist-info → calkit_python-0.49.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: calkit-python
-Version: 0.49.1
+Version: 0.49.2
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.49.1.dist-info → calkit_python-0.49.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 calkit/__init__.py,sha256=5DjFhcuxL5SlsB1Nm1Wf4APuYcR5Kg38IHCxGOhaFPA,2952
 calkit/__main__.py,sha256=whqS7I7q_c9004emvKptZ9B9OVn-jgr5kaLaCFKmwa0,112
 calkit/calc.py,sha256=drtxAZS8lWGKoB3Re29_IVsZNZu7gObuQd3ufFIgqYo,8096
-calkit/conda.py,sha256=ToRoQgpGfZmkSdQPXzn5mmUiGaMkjuq9NJakyjcYq0w,49924
+calkit/conda.py,sha256=9zauxFAXhLef5q-S0RgKATTa0IFkYjC3Nji3RhHpRIw,49924
 calkit/conditions.py,sha256=eaAkq5h2mbE3SRK4mDi_hMax7MnlRXAfl7s9-UPsCpo,9214
 calkit/config.py,sha256=Fx-uSsCrQgxiiS0P219D94uJ0A2bgXCLLjCbKhJLC-U,20996
 calkit/core.py,sha256=fe56ZUQj6SFXc8VzBSRx3Ypn1T2m8Iov82wdTczXo_M,65541
@@ -9,7 +9,7 @@ calkit/datasets.py,sha256=3YtDmvBCzyX5AC-7Mb7ylnxM1mFLyTLj5CH7QqblDwA,2212
 calkit/detect.py,sha256=qEdYOrXMVCUYRoQ7YBQZBn_YZQT3K2GeWSOnWceGpNA,88418
 calkit/docker.py,sha256=i4OqBILrEPUPTmWlMKcB-7vvLZ9lFxBtoqnuCOZcqpU,54825
 calkit/docx.py,sha256=kh9eHBmKBJjH5kYefKg5DyfraDkeLUpdeBFBXwRozoM,55475
-calkit/environments.py,sha256=ITVA8qCfLyM5Ccb7p6XT-5MaEWsHI8mbg8NptYX_bU4,146446
+calkit/environments.py,sha256=qXRm6jCL_cEOHd7t6eTnjHrOGkrDmKWehecKYeDo628,146756
 calkit/fs.py,sha256=7huOJIDPni4bTJ3MZyyifgE4NqbfbT_bPW8Uff-7JMU,45658
 calkit/git.py,sha256=NgUIcpdwWxiHmKrbRGybg10JTRoc-Fr-xzn61vDBiRw,30216
 calkit/github.py,sha256=nBR3CH3mFIDk_atWtZ_EdQEP3ktDi-xNPbe6Bbusarg,1699
@@ -40,7 +40,7 @@ calkit/server.py,sha256=GQm1bI5Q1NLFNwQL-iP6j4iWKUpKpP3cLEyfj5IMwe4,22009
 calkit/upgrade.py,sha256=leUZmUUU8dUAJblTmDBIb6aODmrEzIO2S_uF-aAqEzE,15844
 calkit/workspace.py,sha256=-DlOfzAOg175FBuwOxwO9GAXsDygbfZW_CVFbgljU1w,76264
 calkit/cli/__init__.py,sha256=a6cvqTR1QJpZWloNHDrmWP-X-rRKe5Z0pqCqWtbik0k,4139
-calkit/cli/check.py,sha256=nTeTQ10FZ0njEpAecv06bLKLRwBnmcVef4ztuu37M5w,98097
+calkit/cli/check.py,sha256=wI4Jx9sg7hEkQ3JveNrRontqXyMPSG65g7JIQdYtAx0,98087
 calkit/cli/config.py,sha256=WGve-2OZ4hEv5Z6wpZi536fZyvRMeMv_ZcZGSmmqEDQ,15307
 calkit/cli/core.py,sha256=xracagL9n55c1PjlgWDtL81n1GnnPzeh0f3C25eralk,5698
 calkit/cli/delete.py,sha256=upkQ1P5bghtNc1F71XfOKXo6fbtQfhNXzdpKtcajCIo,1668
@@ -110,7 +110,7 @@ calkit/tests/test_detect.py,sha256=rNi_W5ck4_TZo2_tXfIfTc-U_GxOePdz_jJjaqnewlA,4
 calkit/tests/test_docker.py,sha256=rjGUFCw0zvNMgGqnOo1X9orAOR4x2Pv7yxz2CmhLc9I,23994
 calkit/tests/test_docs_references.py,sha256=n9XZMniIH1XvlUxdlFcLeQuNBwJsDydyVYZOeAh2XrA,5264
 calkit/tests/test_docx.py,sha256=mT2zfx0ysJfpNx746nYD6LDg2jutUhBXYz0uzFlPvdk,32303
-calkit/tests/test_environments.py,sha256=1WL6e2XRv96o4xGwp-yDN7qndNytdDWjoH9oEsoADkE,99426
+calkit/tests/test_environments.py,sha256=wcJqH_JQTQAiJ4ZwhxBJd-DP2zVJSPG5aVEAAhkpSBM,100001
 calkit/tests/test_fs.py,sha256=vBbzZlikzwAQkPwn8_-wdsD-l1R4YTH7g-ghGfWrtzE,13785
 calkit/tests/test_git.py,sha256=gf3V6JfZfFf1ZcwjFu-BF_bgF4eMA83GwkAr1iqgxN0,27081
 calkit/tests/test_hub.py,sha256=H7We9KFZnW2Y5SqKVRqQCOksCjZHDoFc_IFJmiXDANQ,17824
@@ -176,21 +176,21 @@ calkit/agent_skills/check-questions/SKILL.md,sha256=yn6geOQUNQnJbM_Bn9grULerzreG
 calkit/agent_skills/check-reproducibility/SKILL.md,sha256=5SGmtnbq8bSJW0Zwav_aVzfuhilHwBkkdxGuZvPHxGU,4699
 calkit/agent_skills/conventions/SKILL.md,sha256=W9ayIG76Q8BTBgIRhpZz52dCKDLsSVj8_7O3LPeffU4,10323
 calkit/agent_skills/create-pipeline/SKILL.md,sha256=2FGw1iDQVRk5FUq79GP3lPdgvgof2Wi1O9O-abGGtgs,5422
-calkit_python-0.49.1.data/data/etc/jupyter/jupyter_server_config.d/calkit.json,sha256=CWrZP--JDGz8fsvbAlKr_duTL1vDriGT48SL1YCtkY0,81
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/package.json,sha256=0hnHqhCly59Wg7urFGahc2mSupCWwiPfwKWCYfnbB2E,6202
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/schemas/calkit/package.json.orig,sha256=egkbkHmJYzDARH3_4qpoF75_Svpj_dfPaIwRU-PNjW4,6064
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/schemas/calkit/plugin.json,sha256=YSpIrwpwB-lQBk9Mwv-npedWTOOZreO6nlWZhqlWyGI,840
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/506.c34b070098184e33.js,sha256=0PxdmgdZvLeh6RBcfgN1pcriNO8oCeTK5WJvUIEA3MY,112384
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/57d13a7399cec3c5.png,sha256=svHD7-cMtTnRITFwugwsVaB9nZ-h8A61ose8z32HiRE,24850
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/616.528427eb54a4a0c0.js,sha256=d0rHq7cqAjj1GNAMLOpl8dyY8yyKUQcLPCOUr-wJGdQ,8129
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/740.6bf87276e9e5788a.js,sha256=4E0sK8x-ldVkL-1sM07wgJGS1vtVD9Uly7VtoFTi23c,221
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/899.f9b9f9bf705a6493.js,sha256=RNTIItG9k-A_Ip54fRR3QMCjiffkY0bo8zQ2Xh7TyOY,57096
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/935.46ecc6bf99aa593a.js,sha256=Cmp0KWM5YDZ-zcsJWWgqCMIF6adeHQH80rxz1sas45E,51183
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/remoteEntry.109a3a8379365e59.js,sha256=4JavPLcn703qVSC2E1_MD1thrJNL4N-eITjnfNhSDSM,15066
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/style.js,sha256=LTlA3M58hwjqmhomdcrNRO9GM58zZcf0V76WX9HI6EQ,146
-calkit_python-0.49.1.data/data/share/jupyter/labextensions/calkit/static/third-party-licenses.json,sha256=2BGdItLJwO3fAopLl4eJvp26TEwuscYC0-yFaF-LaLU,13683
-calkit_python-0.49.1.dist-info/METADATA,sha256=Q5SDce0Wf_w48juxxkVRLzPG2PRSR37azzsSWStPl1Y,22473
-calkit_python-0.49.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-calkit_python-0.49.1.dist-info/entry_points.txt,sha256=TtpHpcv2vFVAVYxFVp0XrwCV_z7FWIOguEiypXRDoOw,131
-calkit_python-0.49.1.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
-calkit_python-0.49.1.dist-info/RECORD,,
+calkit_python-0.49.2.data/data/etc/jupyter/jupyter_server_config.d/calkit.json,sha256=CWrZP--JDGz8fsvbAlKr_duTL1vDriGT48SL1YCtkY0,81
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/package.json,sha256=0hnHqhCly59Wg7urFGahc2mSupCWwiPfwKWCYfnbB2E,6202
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/schemas/calkit/package.json.orig,sha256=egkbkHmJYzDARH3_4qpoF75_Svpj_dfPaIwRU-PNjW4,6064
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/schemas/calkit/plugin.json,sha256=YSpIrwpwB-lQBk9Mwv-npedWTOOZreO6nlWZhqlWyGI,840
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/506.c34b070098184e33.js,sha256=0PxdmgdZvLeh6RBcfgN1pcriNO8oCeTK5WJvUIEA3MY,112384
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/57d13a7399cec3c5.png,sha256=svHD7-cMtTnRITFwugwsVaB9nZ-h8A61ose8z32HiRE,24850
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/616.528427eb54a4a0c0.js,sha256=d0rHq7cqAjj1GNAMLOpl8dyY8yyKUQcLPCOUr-wJGdQ,8129
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/740.6bf87276e9e5788a.js,sha256=4E0sK8x-ldVkL-1sM07wgJGS1vtVD9Uly7VtoFTi23c,221
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/899.f9b9f9bf705a6493.js,sha256=RNTIItG9k-A_Ip54fRR3QMCjiffkY0bo8zQ2Xh7TyOY,57096
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/935.46ecc6bf99aa593a.js,sha256=Cmp0KWM5YDZ-zcsJWWgqCMIF6adeHQH80rxz1sas45E,51183
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/remoteEntry.109a3a8379365e59.js,sha256=4JavPLcn703qVSC2E1_MD1thrJNL4N-eITjnfNhSDSM,15066
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/style.js,sha256=LTlA3M58hwjqmhomdcrNRO9GM58zZcf0V76WX9HI6EQ,146
+calkit_python-0.49.2.data/data/share/jupyter/labextensions/calkit/static/third-party-licenses.json,sha256=2BGdItLJwO3fAopLl4eJvp26TEwuscYC0-yFaF-LaLU,13683
+calkit_python-0.49.2.dist-info/METADATA,sha256=PIzOMSpvNfpXR4kIV4dTKLDBW9B-cZSIEvIknKfdiWE,22473
+calkit_python-0.49.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+calkit_python-0.49.2.dist-info/entry_points.txt,sha256=TtpHpcv2vFVAVYxFVp0XrwCV_z7FWIOguEiypXRDoOw,131
+calkit_python-0.49.2.dist-info/licenses/LICENSE,sha256=9ZamCaSUTZk9rcrnf-sWFKLOHr3ws-S_dgKMegW4nw8,1056
+calkit_python-0.49.2.dist-info/RECORD,,