Skip to content

Commit 9a166a7

Browse files
committed
Run on macOS
1 parent dc3b5bc commit 9a166a7

File tree

2 files changed

+38
-44
lines changed

2 files changed

+38
-44
lines changed

dvc.lock

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ stages:
33
collect-data:
44
cmd: calkit xenv -n py --no-check -- python scripts/collect-data.py
55
deps:
6-
- path: .calkit/env-locks/venvs/linux-64/py.txt
6+
- path: .calkit/env-locks/venvs/osx-arm64/py.txt
77
hash: md5
88
md5: de96276868627f6d4aa908b2b4759a56
99
size: 231
@@ -14,28 +14,28 @@ stages:
1414
outs:
1515
- path: data/raw/data.csv
1616
hash: md5
17-
md5: 3ec6df511ed8ebacdc436ce815ada1df
18-
size: 43628
17+
md5: a4016abbdee4dfec61c5a8b26897fcce
18+
size: 43605
1919
plot-voltage:
2020
cmd: calkit xenv -n py --no-check -- python scripts/plot-voltage.py
2121
deps:
22-
- path: .calkit/env-locks/venvs/linux-64/py.txt
22+
- path: .calkit/env-locks/venvs/osx-arm64/py.txt
2323
hash: md5
2424
md5: de96276868627f6d4aa908b2b4759a56
2525
size: 231
2626
- path: data/raw/data.csv
2727
hash: md5
28-
md5: 3ec6df511ed8ebacdc436ce815ada1df
29-
size: 43628
28+
md5: a4016abbdee4dfec61c5a8b26897fcce
29+
size: 43605
3030
- path: scripts/plot-voltage.py
3131
hash: md5
3232
md5: 087a567a0c0f6199a908399013d564a1
3333
size: 297
3434
outs:
3535
- path: figures/voltage-time-series.png
3636
hash: md5
37-
md5: a70b61dc033585fe2d3c16d63290a870
38-
size: 46210
37+
md5: 61c669be4713b55f20e78e363032a0d6
38+
size: 41780
3939
copy-figures-to-paper-dir:
4040
cmd: cp -r figures paper/figures
4141
deps:
@@ -51,17 +51,17 @@ stages:
5151
size: 45148
5252
nfiles: 2
5353
build-paper:
54-
cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc
55-
-interaction=nonstopmode -silent -synctex=1 -pdf paper/paper.tex
54+
cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc -interaction=nonstopmode
55+
-silent -synctex=1 -pdf paper/paper.tex
5656
deps:
57-
- path: .calkit/env-locks/docker/amd64/tex.json
57+
- path: .calkit/env-locks/docker/arm64/tex.json
5858
hash: md5
59-
md5: af028316fd879fcf385e0838e3b7ad08
59+
md5: 66ebd31ba776ec05d1054b3422054684
6060
size: 1171
6161
- path: figures
6262
hash: md5
63-
md5: 70126dc2f9f61fb93c62eb50b55f13f1.dir
64-
size: 46235
63+
md5: e98d516390e045dbd789d4a3d30d3682.dir
64+
size: 41805
6565
nfiles: 2
6666
- path: paper/paper.tex
6767
hash: md5
@@ -70,11 +70,10 @@ stages:
7070
outs:
7171
- path: paper/paper.pdf
7272
hash: md5
73-
md5: 7069d28ed4063d3bec319c661681648a
74-
size: 98339
73+
md5: cc984d8729aed788b7b609055129c61c
74+
size: 96346
7575
_check_env_py:
76-
cmd: calkit check conda-env --file environment.yml --output
77-
.calkit/env-locks/py.yml
76+
cmd: calkit check conda-env --file environment.yml --output .calkit/env-locks/py.yml
7877
deps:
7978
- path: environment.yml
8079
hash: md5
@@ -86,8 +85,7 @@ stages:
8685
md5: 8119fb42c7e8531010248790fff169cf
8786
size: 2200
8887
_check_env_tex:
89-
cmd: calkit check docker-env texlive/texlive:latest-full -o
90-
.calkit/env-locks/tex.json
88+
cmd: calkit check docker-env texlive/texlive:latest-full -o .calkit/env-locks/tex.json
9189
outs:
9290
- path: .calkit/env-locks/tex.json
9391
hash: md5
@@ -101,14 +99,14 @@ stages:
10199
md5: 2d0e401b7292d0d218bc567bfb37f9c7
102100
size: 24
103101
outs:
104-
- path: .calkit/env-locks/venvs/linux-64/py.txt
102+
- path: .calkit/env-locks/venvs/osx-arm64/py.txt
105103
hash: md5
106104
md5: de96276868627f6d4aa908b2b4759a56
107105
size: 231
108106
_check-env-tex:
109107
cmd: calkit check environment --name tex
110108
outs:
111-
- path: .calkit/env-locks/docker/amd64/tex.json
109+
- path: .calkit/env-locks/docker/arm64/tex.json
112110
hash: md5
113-
md5: af028316fd879fcf385e0838e3b7ad08
111+
md5: 66ebd31ba776ec05d1054b3422054684
114112
size: 1171

dvc.yaml

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,47 @@ stages:
44
deps:
55
- requirements.txt
66
outs:
7-
- .calkit/env-locks/venvs/linux-64/py.txt:
7+
- .calkit/env-locks/venvs/osx-arm64/py.txt:
88
cache: false
99
persist: true
1010
always_changed: true
11-
desc: Automatically generated by Calkit. Changes made here will be
12-
overwritten.
11+
desc: Automatically generated by Calkit. Changes made here will be overwritten.
1312
_check-env-tex:
1413
cmd: calkit check environment --name tex
1514
deps: []
1615
outs:
17-
- .calkit/env-locks/docker/amd64/tex.json:
16+
- .calkit/env-locks/docker/arm64/tex.json:
1817
cache: false
1918
persist: true
2019
always_changed: true
21-
desc: Automatically generated by Calkit. Changes made here will be
22-
overwritten.
20+
desc: Automatically generated by Calkit. Changes made here will be overwritten.
2321
collect-data:
24-
cmd: calkit xenv -n py --no-check -- python
25-
scripts/collect-data.py
22+
cmd: calkit xenv -n py --no-check -- python scripts/collect-data.py
2623
deps:
2724
- scripts/collect-data.py
28-
- .calkit/env-locks/venvs/linux-64/py.txt
25+
- .calkit/env-locks/venvs/osx-arm64/py.txt
2926
outs:
3027
- data/raw/data.csv
31-
desc: Automatically generated from the 'collect-data' stage in
32-
calkit.yaml. Changes made here will be overwritten.
28+
desc: Automatically generated from the 'collect-data' stage in calkit.yaml.
29+
Changes made here will be overwritten.
3330
plot-voltage:
34-
cmd: calkit xenv -n py --no-check -- python
35-
scripts/plot-voltage.py
31+
cmd: calkit xenv -n py --no-check -- python scripts/plot-voltage.py
3632
deps:
3733
- scripts/plot-voltage.py
38-
- .calkit/env-locks/venvs/linux-64/py.txt
34+
- .calkit/env-locks/venvs/osx-arm64/py.txt
3935
- data/raw/data.csv
4036
outs:
4137
- figures/voltage-time-series.png
42-
desc: Automatically generated from the 'plot-voltage' stage in
43-
calkit.yaml. Changes made here will be overwritten.
38+
desc: Automatically generated from the 'plot-voltage' stage in calkit.yaml.
39+
Changes made here will be overwritten.
4440
build-paper:
45-
cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc
46-
-interaction=nonstopmode -silent -synctex=1 -pdf paper/paper.tex
41+
cmd: calkit xenv -n tex --no-check -- latexmk -cd -norc -interaction=nonstopmode
42+
-silent -synctex=1 -pdf paper/paper.tex
4743
deps:
4844
- paper/paper.tex
4945
- figures
50-
- .calkit/env-locks/docker/amd64/tex.json
46+
- .calkit/env-locks/docker/arm64/tex.json
5147
outs:
5248
- paper/paper.pdf
53-
desc: Automatically generated from the 'build-paper' stage in
54-
calkit.yaml. Changes made here will be overwritten.
49+
desc: Automatically generated from the 'build-paper' stage in calkit.yaml.
50+
Changes made here will be overwritten.

0 commit comments

Comments
 (0)