Use new style env-lock scheme

.github/workflows/run.yml

@@ -33,6 +33,6 @@ jobs:
       - name: Setup uv
         uses: astral-sh/setup-uv@v5
       - name: Install Calkit
-        run: uv tool install calkit-python
+        run: uv tool install git+https://github.com/calkit/calkit.git@status
       - name: Run Calkit
         uses: calkit/run-action@v2

dvc.lock

@@ -3,39 +3,41 @@ stages:
   collect-data:
     cmd: calkit xenv -n py --no-check -- python scripts/collect-data.py
     deps:
-    - path: .calkit/env-locks/venvs/linux-64/py.txt
+    - path: .calkit/env-locks/py
       hash: md5
-      md5: de96276868627f6d4aa908b2b4759a56
-      size: 231
+      md5: 6a3d291988c3964eaf329ec3c2c9b9f5.dir
+      size: 462
+      nfiles: 2
     - path: scripts/collect-data.py
       hash: md5
       md5: eeab1328ac4a9df2ef2452d32c1e6cce
       size: 424
     outs:
     - path: data/raw/data.csv
       hash: md5
-      md5: 3ec6df511ed8ebacdc436ce815ada1df
-      size: 43628
+      md5: b6f6ce8a671a7be4c22491be9ee9614b
+      size: 43716
   plot-voltage:
     cmd: calkit xenv -n py --no-check -- python scripts/plot-voltage.py
     deps:
-    - path: .calkit/env-locks/venvs/linux-64/py.txt
+    - path: .calkit/env-locks/py
       hash: md5
-      md5: de96276868627f6d4aa908b2b4759a56
-      size: 231
+      md5: 6a3d291988c3964eaf329ec3c2c9b9f5.dir
+      size: 462
+      nfiles: 2
     - path: data/raw/data.csv
       hash: md5
-      md5: 3ec6df511ed8ebacdc436ce815ada1df
-      size: 43628
+      md5: b6f6ce8a671a7be4c22491be9ee9614b
+      size: 43716
     - path: scripts/plot-voltage.py
       hash: md5
       md5: 087a567a0c0f6199a908399013d564a1
       size: 297
     outs:
     - path: figures/voltage-time-series.png
       hash: md5
-      md5: a70b61dc033585fe2d3c16d63290a870
-      size: 46210
+      md5: a0e5b3c3e2e42189f6303e7b1d90499b
+      size: 46338
   copy-figures-to-paper-dir:
     cmd: cp -r figures paper/figures
     deps:
@@ -54,14 +56,15 @@ stages:
     cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc 
       -interaction=nonstopmode -silent -synctex=1 -pdf paper/paper.tex
     deps:
-    - path: .calkit/env-locks/docker/amd64/tex.json
+    - path: .calkit/env-locks/tex
       hash: md5
-      md5: af028316fd879fcf385e0838e3b7ad08
-      size: 1171
+      md5: fdae1edb4dcd23e4265e4f7701b324a3.dir
+      size: 2342
+      nfiles: 2
     - path: figures
       hash: md5
-      md5: 70126dc2f9f61fb93c62eb50b55f13f1.dir
-      size: 46235
+      md5: 69cf1654863a79b7342838ff9ca78a72.dir
+      size: 46363
       nfiles: 2
     - path: paper/paper.tex
       hash: md5
@@ -70,8 +73,8 @@ stages:
     outs:
     - path: paper/paper.pdf
       hash: md5
-      md5: 7069d28ed4063d3bec319c661681648a
-      size: 98339
+      md5: 24df231bcb8754c9bb3bf1087c31dd48
+      size: 97240
   _check_env_py:
     cmd: calkit check conda-env --file environment.yml --output 
       .calkit/env-locks/py.yml
@@ -101,14 +104,16 @@ stages:
       md5: 2d0e401b7292d0d218bc567bfb37f9c7
       size: 24
     outs:
-    - path: .calkit/env-locks/venvs/linux-64/py.txt
+    - path: .calkit/env-locks/py
       hash: md5
-      md5: de96276868627f6d4aa908b2b4759a56
-      size: 231
+      md5: 6a3d291988c3964eaf329ec3c2c9b9f5.dir
+      size: 462
+      nfiles: 2
   _check-env-tex:
     cmd: calkit check environment --name tex
     outs:
-    - path: .calkit/env-locks/docker/amd64/tex.json
+    - path: .calkit/env-locks/tex
       hash: md5
-      md5: af028316fd879fcf385e0838e3b7ad08
-      size: 1171
+      md5: fdae1edb4dcd23e4265e4f7701b324a3.dir
+      size: 2342
+      nfiles: 2

dvc.yaml

@@ -4,7 +4,7 @@ stages:
     deps:
       - requirements.txt
     outs:
-      - .calkit/env-locks/venvs/linux-64/py.txt:
+      - .calkit/env-locks/py:
           cache: false
           persist: true
     always_changed: true
@@ -14,7 +14,7 @@ stages:
     cmd: calkit check environment --name tex
     deps: []
     outs:
-      - .calkit/env-locks/docker/amd64/tex.json:
+      - .calkit/env-locks/tex:
           cache: false
           persist: true
     always_changed: true
@@ -25,7 +25,7 @@ stages:
       scripts/collect-data.py
     deps:
       - scripts/collect-data.py
-      - .calkit/env-locks/venvs/linux-64/py.txt
+      - .calkit/env-locks/py
     outs:
       - data/raw/data.csv
     desc: Automatically generated from the 'collect-data' stage in 
@@ -35,7 +35,7 @@ stages:
       scripts/plot-voltage.py
     deps:
       - scripts/plot-voltage.py
-      - .calkit/env-locks/venvs/linux-64/py.txt
+      - .calkit/env-locks/py
       - data/raw/data.csv
     outs:
       - figures/voltage-time-series.png
@@ -47,7 +47,7 @@ stages:
     deps:
       - paper/paper.tex
       - figures
-      - .calkit/env-locks/docker/amd64/tex.json
+      - .calkit/env-locks/tex
     outs:
       - paper/paper.pdf
     desc: Automatically generated from the 'build-paper' stage in