Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .calkit/env-locks/tex/amd64.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{
"RepoTags": [
"texlive/texlive:latest-full"
],
"RepoDigests": [
"texlive/texlive@sha256:e45f6b51d756d7519fafd3a94f51db2190504e0d222eb960888a77cc6942fdd0"
"sha256:fc4a4a892bc9b081b878b06c75f8c580e8d0faf38298e00c94bdb2acd2936820"
],
"Architecture": "amd64",
"Os": "linux",
"RootFS": {
"Type": "layers",
"Layers": [
"sha256:b9f4f71ae755f9248e2687e6a423ca7419a150748a6d3360adacb13daf683ad9",
"sha256:0cc6f5ed69e4a948391449e0a1ba6fe0b15146183db3397e6283c3a3bdfdadd9",
"sha256:b8b870d9cf70eabd4262868eedace16a70070399629ca624e3c511d56d1e5607",
"sha256:65e5d715ea720349e6475f91651a0956279fc295a45fd73aa04f1cec046281a1",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:d0f5df9e47b9f29f13f1d9ecbdd803d24bf2de8e6d61ffdfd6f71f989cedc680",
"sha256:e1d971b42eff7eaf1e929efcd296236a5111816837a6aa72f0401688965331e5",
"sha256:96bd540ad112be71847230ec13da112a2e354bce67c188ffb580aa0ddf8e90a6",
"sha256:17331da551fd81773f95a7c44d03512258fce9ef8b6c8562a58c478224cb650e",
"sha256:558896e672597f6be2ca87e26aa62c7a50c4985145e14593bb9fb364c7b571f1"
"sha256:6d062499e80adae006efb7f62f5411765ce8ddd529d89a120ed291fb573ad84e",
"sha256:a120b381383b67247712f403c5373be4d030eeb011f0ebfe792a34badb2422b3",
"sha256:d811d001ca6fc06e715d74c0a53c6d8093a01eee62caf9bf58fbc86242623fb3",
"sha256:3922bfbd9cca954f88789cccfe51ee8f295ac9fbd5f3c4dc739ac328111010ca",
"sha256:e4410bf41c474a72e7a64dfffb72d2c70ff7396f1ad6b602d3c21bdbeb61a844",
"sha256:44290c585df3d4005df98dc3abcc7a2f4d9f1fb8d6ad473bbede4a536f2fd63c",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
]
},
"DockerfileMD5": null,
Expand Down
21 changes: 9 additions & 12 deletions .calkit/env-locks/tex/arm64.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{
"RepoTags": [
"texlive/texlive:latest-full"
],
"RepoDigests": [
"texlive/texlive@sha256:e45f6b51d756d7519fafd3a94f51db2190504e0d222eb960888a77cc6942fdd0"
"sha256:fc4a4a892bc9b081b878b06c75f8c580e8d0faf38298e00c94bdb2acd2936820"
],
"Architecture": "arm64",
"Os": "linux",
"RootFS": {
"Type": "layers",
"Layers": [
"sha256:47d21236eed2810c99a4120640b957ce5b4d992408cd8f1c5af4d751c9f9f3c3",
"sha256:a5443f392f694d014044d76b76cb853a45606fc8c27eb49b8248404873237a3e",
"sha256:99b47e5ea502b54a7b25702eae5f4d6554c7a263edb397af71eabe13178b3c98",
"sha256:8edaba05454265cd17270d38ec146446c640d1d25637413c3da64a3eff296c36",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
"sha256:b754a94f61ee25699b4f6e9c8f4a85d7cbeb0814973cd16cead6fbfe94e822a4",
"sha256:4253f7276d1c859434b72cf61c4c3e31bc92141049754f1fbb2febeec0a32aa4",
"sha256:fa4d57b96d77bbedf46895dccef2c37c35cd4b90e60028a4f7bed8d26f095216",
"sha256:8c5f1f4d86faffad0d4a4f84b3485b9312fdf0917de2326b1462a8ebc5c8ab53",
"sha256:d31f0001fca0ba1ee95ae5657dfcd8f4e203d29c216bdd938c30cfde5da91aa5"
"sha256:10863c806987d3fa3acfafcf20fbb8f2a88d95e792d0cc5cfed0ca2bd87a7ca7",
"sha256:962ba90483605e8aee6d9fefba4dbf39e6b3182cc8a07e9373fa14595b9f7598",
"sha256:e451d3bf1d1c35596950d50a33da159d3c9062a14d377b19f842be7b7f716443",
"sha256:059fced89a6b7b9d58f4227128eb3f831257af5b5fb67da31fb394795dba75e5",
"sha256:b4fd48c32067ab55a7db8fe466be321db605698fffa86c474052d210f93279ad",
"sha256:d731c9502f215dd9ad4f22d514137a6dbee613528e9aec62699fa3c3f5fef39e",
"sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
]
},
"DockerfileMD5": null,
Expand Down
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# >>> calkit generated files (managed by calkit) >>>
/.calkit/** text eol=lf
# <<< calkit generated files <<<
2 changes: 1 addition & 1 deletion calkit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ environments:
description: A Python virtual environment managed with uv
tex:
kind: docker
image: texlive/texlive:latest-full
image: ghcr.io/calkit/latex:0.1.1
description: TeX Live via Docker.

pipeline:
Expand Down
10 changes: 5 additions & 5 deletions dvc.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ stages:
deps:
- path: .calkit/env-locks/tex
hash: md5
md5: 6e6fd137d3e11267da50d89f781b0552.dir
size: 2294
md5: ce6f4ee12b26e1a6788946561bb7ef14.dir
size: 2136
nfiles: 2
- path: paper/figures
hash: md5
Expand All @@ -70,8 +70,8 @@ stages:
outs:
- path: paper/main.pdf
hash: md5
md5: 470d3514ddd9d74a5d65b6a1927b14c2
size: 128672
md5: c5663f5c1a529163ac338c817059f020
size: 128835
_check_env_py:
cmd: calkit check conda-env --file environment.yml --output
.calkit/env-locks/py.yml
Expand Down Expand Up @@ -115,7 +115,7 @@ stages:
size: 2342
nfiles: 2
figs-to-paper:
cmd: calkit map-paths --dir-to-dir-replace 'figures->paper/figures'
cmd: calkit map-paths --dir-to-dir-replace "figures->paper/figures"
deps:
- path: figures
hash: md5
Expand Down
22 changes: 10 additions & 12 deletions dvc.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
stages:
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/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.
analyze:
cmd: calkit xenv -n py --no-check -- python scripts/analyze.py
deps:
Expand All @@ -20,19 +19,18 @@ stages:
- results/summary.json:
cache: false
persist: false
desc: Automatically generated from the 'analyze' stage in
calkit.yaml. Changes made here will be overwritten.
desc: Automatically generated from the 'analyze' stage in calkit.yaml.
Changes made here will be overwritten.
figs-to-paper:
cmd: calkit map-paths --dir-to-dir-replace
'figures->paper/figures'
cmd: calkit map-paths --dir-to-dir-replace "figures->paper/figures"
deps:
- figures
outs:
- paper/figures:
cache: false
persist: true
desc: Automatically generated from the 'figs-to-paper' stage in
calkit.yaml. Changes made here will be overwritten.
desc: Automatically generated from the 'figs-to-paper' stage in calkit.yaml.
Changes made here will be overwritten.
results-to-tex:
cmd: calkit latex from-json 'results/summary.json' --output
'paper/results.tex'
Expand All @@ -54,5 +52,5 @@ stages:
- paper/results.tex
outs:
- paper/main.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.
Loading