Use new style env-lock scheme

Author: petebachant

.calkit/env-locks/docker/amd64/tex.json

@@ -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
+      md5: 97801bd5ad552a89970a09edb1bc525d.dir
       size: 231
+      nfiles: 1
     - path: scripts/collect-data.py
       hash: md5
       md5: eeab1328ac4a9df2ef2452d32c1e6cce
       size: 424
     outs:
     - path: data/raw/data.csv
       hash: md5
-      md5: 3ec6df511ed8ebacdc436ce815ada1df
-      size: 43628
+      md5: 0e1fcf8330919e3e736ec3be03b7baa9
+      size: 43613
   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
+      md5: 97801bd5ad552a89970a09edb1bc525d.dir
       size: 231
+      nfiles: 1
     - path: data/raw/data.csv
       hash: md5
-      md5: 3ec6df511ed8ebacdc436ce815ada1df
-      size: 43628
+      md5: 0e1fcf8330919e3e736ec3be03b7baa9
+      size: 43613
     - 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: 062d0b4f4e8087221204d12c1f594223
+      size: 44207
   copy-figures-to-paper-dir:
     cmd: cp -r figures paper/figures
     deps:
@@ -51,17 +53,18 @@ stages:
       size: 45148
       nfiles: 2
   build-paper:
-    cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc 
-      -interaction=nonstopmode -silent -synctex=1 -pdf paper/paper.tex
+    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
+      md5: 2c552307edd59397026c9ef06dc8af47.dir
       size: 1171
+      nfiles: 1
     - path: figures
       hash: md5
-      md5: 70126dc2f9f61fb93c62eb50b55f13f1.dir
-      size: 46235
+      md5: 51682cce447229821989f677c23caa75.dir
+      size: 44232
       nfiles: 2
     - path: paper/paper.tex
       hash: md5
@@ -70,11 +73,10 @@ stages:
     outs:
     - path: paper/paper.pdf
       hash: md5
-      md5: 7069d28ed4063d3bec319c661681648a
-      size: 98339
+      md5: eddd55ddc8410adef45250b708b0947f
+      size: 99255
   _check_env_py:
-    cmd: calkit check conda-env --file environment.yml --output 
-      .calkit/env-locks/py.yml
+    cmd: calkit check conda-env --file environment.yml --output .calkit/env-locks/py.yml
     deps:
     - path: environment.yml
       hash: md5
@@ -86,8 +88,7 @@ stages:
       md5: 8119fb42c7e8531010248790fff169cf
       size: 2200
   _check_env_tex:
-    cmd: calkit check docker-env texlive/texlive:latest-full -o 
-      .calkit/env-locks/tex.json
+    cmd: calkit check docker-env texlive/texlive:latest-full -o .calkit/env-locks/tex.json
     outs:
     - path: .calkit/env-locks/tex.json
       hash: md5
@@ -101,14 +102,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
+      md5: 97801bd5ad552a89970a09edb1bc525d.dir
       size: 231
+      nfiles: 1
   _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
+      md5: 2c552307edd59397026c9ef06dc8af47.dir
       size: 1171
+      nfiles: 1

.calkit/env-locks/venvs/linux-64/py.txt .calkit/env-locks/py/osx-arm64.txt.calkit/env-locks/venvs/linux-64/py.txt renamed to .calkit/env-locks/py/osx-arm64.txt

@@ -4,51 +4,47 @@ stages:
     deps:
       - requirements.txt
     outs:
-      - .calkit/env-locks/venvs/linux-64/py.txt:
+      - .calkit/env-locks/py:
           cache: false
           persist: true
     always_changed: true
-    desc: Automatically generated by Calkit. Changes made here will be
-      overwritten.
+    desc: Automatically generated by Calkit. Changes made here will be overwritten.
   _check-env-tex:
     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
-    desc: Automatically generated by Calkit. Changes made here will be
-      overwritten.
+    desc: Automatically generated by Calkit. Changes made here will be overwritten.
   collect-data:
-    cmd: calkit xenv -n py --no-check -- python 
-      scripts/collect-data.py
+    cmd: calkit xenv -n py --no-check -- python 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 
-      calkit.yaml. Changes made here will be overwritten.
+    desc: Automatically generated from the 'collect-data' stage in calkit.yaml.
+      Changes made here will be overwritten.
   plot-voltage:
-    cmd: calkit xenv -n py --no-check -- python 
-      scripts/plot-voltage.py
+    cmd: calkit xenv -n py --no-check -- python 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
-    desc: Automatically generated from the 'plot-voltage' stage in 
-      calkit.yaml. Changes made here will be overwritten.
+    desc: Automatically generated from the 'plot-voltage' stage in calkit.yaml.
+      Changes made here will be overwritten.
   build-paper:
-    cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc 
-      -interaction=nonstopmode -silent -synctex=1 -pdf paper/paper.tex
+    cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc -interaction=nonstopmode
+      -silent -synctex=1 -pdf paper/paper.tex
     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 
-      calkit.yaml. Changes made here will be overwritten.
+    desc: Automatically generated from the 'build-paper' stage in calkit.yaml.
+      Changes made here will be overwritten.