Modernize a bit

Author: petebachant

.dvc/config

@@ -1,5 +1,5 @@
 [core]
     remote = calkit
 ['remote "calkit"']
-    url = https://api.calkit.io/projects/petebachant/example-basic/dvc
+    url = https://api.calkit.io/projects/calkit/example-basic/dvc
     auth = custom

dvc.lock

@@ -1,33 +1,41 @@
 schema: '2.0'
 stages:
   collect-data:
-    cmd: python scripts/collect-data.py
+    cmd: calkit runenv -n py -- python scripts/collect-data.py
     deps:
+    - path: environment.yml
+      hash: md5
+      md5: 627d0116e60eab837fbf07edb4d370e0
+      size: 114
     - path: scripts/collect-data.py
       hash: md5
       md5: 570acda0f323c18ae0a336583e9d661d
       size: 424
     outs:
     - path: data/raw/data.csv
       hash: md5
-      md5: 1eec95cacd0a1ad08e06b727d8b701c2
-      size: 43618
+      md5: 2f95ffed166d10441ff6a9dbf57e80d6
+      size: 43623
   plot-voltage:
-    cmd: python scripts/plot-voltage.py
+    cmd: calkit runenv -n py -- python scripts/plot-voltage.py
     deps:
     - path: data/raw/data.csv
       hash: md5
-      md5: 1eec95cacd0a1ad08e06b727d8b701c2
-      size: 43618
+      md5: 2f95ffed166d10441ff6a9dbf57e80d6
+      size: 43623
+    - path: environment.yml
+      hash: md5
+      md5: 627d0116e60eab837fbf07edb4d370e0
+      size: 114
     - path: scripts/plot-voltage.py
       hash: md5
       md5: 087a567a0c0f6199a908399013d564a1
       size: 297
     outs:
     - path: figures/voltage-time-series.png
       hash: md5
-      md5: a4fc5ebee750a839c23baee1e58bf94a
-      size: 45123
+      md5: 2f8ba1b51544c4fe43ef6aac9a54723b
+      size: 47290
   copy-figures-to-paper-dir:
     cmd: cp -r figures paper/figures
     deps:
@@ -43,19 +51,20 @@ stages:
       size: 45148
       nfiles: 2
   build-paper:
-    cmd: latexmk -pdf paper.tex
+    cmd: "calkit runenv -n tex -- \"cd paper && latexmk -interaction=nonstopmode -pdf
+      paper.tex\"\n"
     deps:
-    - path: ../figures
+    - path: figures
       hash: md5
-      md5: d6fd2418e3b774996ddd0f26715c36ac.dir
-      size: 45148
+      md5: 770239afa5189caf8c2e2fc9664138fd.dir
+      size: 47315
       nfiles: 2
-    - path: paper.tex
+    - path: paper/paper.tex
       hash: md5
       md5: f0c474020965d39585a2c0cc99d6cb8f
       size: 519
     outs:
-    - path: paper.pdf
+    - path: paper/paper.pdf
       hash: md5
-      md5: c736dfef6da2768017e4cb293adcaa3e
-      size: 89940
+      md5: 15a3330b3c915468052650545d943a42
+      size: 96051

dvc.yaml

@@ -1,22 +1,25 @@
 stages:
   collect-data:
-    cmd: python scripts/collect-data.py
+    cmd: calkit runenv -n py -- python scripts/collect-data.py
     deps:
       - scripts/collect-data.py
+      - environment.yml
     outs:
       - data/raw/data.csv
   plot-voltage:
-    cmd: python scripts/plot-voltage.py
+    cmd: calkit runenv -n py -- python scripts/plot-voltage.py
     deps:
       - scripts/plot-voltage.py
       - data/raw/data.csv
+      - environment.yml
     outs:
       - figures/voltage-time-series.png
   build-paper:
-    cmd: latexmk -pdf paper.tex
-    wdir: paper
+    cmd: >
+      calkit runenv -n tex --
+      "cd paper && latexmk -interaction=nonstopmode -pdf paper.tex"
     deps:
-      - ../figures
-      - paper.tex
+      - figures
+      - paper/paper.tex
     outs:
-      - paper.pdf
+      - paper/paper.pdf

environment-lock.yml

@@ -0,0 +1,66 @@
+channels:
+  - conda-forge
+dependencies:
+  - brotli=1.1.0
+  - brotli-bin=1.1.0
+  - bzip2=1.0.8
+  - ca-certificates=2024.8.30
+  - certifi=2024.8.30
+  - contourpy=1.3.1
+  - cycler=0.12.1
+  - fonttools=4.55.3
+  - freetype=2.12.1
+  - kiwisolver=1.4.7
+  - lcms2=2.16
+  - lerc=4.0.0
+  - libblas=3.9.0
+  - libbrotlicommon=1.1.0
+  - libbrotlidec=1.1.0
+  - libbrotlienc=1.1.0
+  - libcblas=3.9.0
+  - libcxx=19.1.5
+  - libdeflate=1.22
+  - libexpat=2.6.4
+  - libffi=3.4.2
+  - libgfortran=5.0.0
+  - libgfortran5=13.2.0
+  - libjpeg-turbo=3.0.0
+  - liblapack=3.9.0
+  - liblzma=5.6.3
+  - libmpdec=4.0.0
+  - libopenblas=0.3.28
+  - libpng=1.6.44
+  - libsqlite=3.47.2
+  - libtiff=4.7.0
+  - libwebp-base=1.4.0
+  - libxcb=1.17.0
+  - libzlib=1.3.1
+  - llvm-openmp=19.1.5
+  - matplotlib=3.9.3
+  - matplotlib-base=3.9.3
+  - munkres=1.1.4
+  - ncurses=6.5
+  - numpy=2.2.0
+  - openjpeg=2.5.3
+  - openssl=3.4.0
+  - packaging=24.2
+  - pandas=2.2.3
+  - pillow=11.0.0
+  - pip=24.3.1
+  - pthread-stubs=0.4
+  - pyparsing=3.2.0
+  - python=3.13.1
+  - python-dateutil=2.9.0.post0
+  - python-tzdata=2024.2
+  - python_abi=3.13
+  - pytz=2024.1
+  - qhull=2020.2
+  - readline=8.2
+  - six=1.17.0
+  - tk=8.6.13
+  - tornado=6.4.2
+  - tzdata=2024b
+  - xorg-libxau=1.0.11
+  - xorg-libxdmcp=1.1.5
+  - zstd=1.5.6
+name: calkit-example-basic

environment.yml

@@ -1,4 +1,4 @@
-name: py
+name: calkit-example-basic
 channels:
   - conda-forge
 dependencies: