From dfb4b1a258bede304adb7e0c79664ce96533b914 Mon Sep 17 00:00:00 2001 From: Becca <32020426+rebeccamccabe@users.noreply.github.com> Date: Sat, 20 Sep 2025 15:35:41 -0400 Subject: [PATCH 1/2] Add Jupyter and remove latex pull from devcontainer To match dc9f1b2c957c7bafb8b92c9e370dc03389f470b2 at calkit/example-basic --- .devcontainer/calkit/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/calkit/devcontainer.json b/.devcontainer/calkit/devcontainer.json index 0fe4c0ec..58d419e3 100644 --- a/.devcontainer/calkit/devcontainer.json +++ b/.devcontainer/calkit/devcontainer.json @@ -15,7 +15,8 @@ "streetsidesoftware.code-spell-checker", "redhat.vscode-yaml", "akamud.vscode-theme-onedark", - "mechatroner.rainbow-csv" + "mechatroner.rainbow-csv", + "ms-toolsai.jupyter" ], "settings": { "latex-workshop.latex.external.build.command": "calkit", @@ -40,6 +41,5 @@ "mounts": [ "source=${localEnv:HOME}/.calkit,target=/home/vscode/.calkit,type=bind,consistency=cached" ], - "postCreateCommand": "conda init bash", - "postStartCommand": "docker pull texlive/texlive:latest-full" + "postCreateCommand": "conda init bash" } From e00f10497c29b85030da5254b4a4bb17bec02036 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Sep 2025 19:38:32 +0000 Subject: [PATCH 2/2] Run pipeline --- .calkit/env-locks/tex.json | 20 ++++++++++---------- dvc.lock | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.calkit/env-locks/tex.json b/.calkit/env-locks/tex.json index 09a36ad8..ca9f142b 100644 --- a/.calkit/env-locks/tex.json +++ b/.calkit/env-locks/tex.json @@ -3,23 +3,23 @@ "texlive/texlive:latest-full" ], "RepoDigests": [ - "texlive/texlive@sha256:bb01a2449cff26abafb4788a5ea01d37ce1d3329af87a0344433c9610eda44b4" + "texlive/texlive@sha256:a95956d683071411d628044dafa2c2824501316474453a989150d4986c073046" ], "Architecture": "amd64", "Os": "linux", - "Size": 5220539927, + "Size": 5209111249, "RootFS": { "Type": "layers", "Layers": [ - "sha256:612c2b206201f241fa381be8ec4426c972d1f1f87aa0a03c6069e3208234cdd8", - "sha256:8196c9c43ec0aa8e017a38c796801359c227a833cecfeb59181808168c3549a5", - "sha256:9c8da95dfba8fa8369ba70af7e5daf0825c4c088c2cd0a599a070f1827b08fbe", + "sha256:41faf5229ff80efa7318ee6b9a00a43c616064081953c40d4e41288064791852", + "sha256:112fae3f00e21a4a090f36bfbc7ae6d7af58f69a8250623b1bd24fdd86bc560f", + "sha256:c3f91a6a0c97ccb6926209e4583276accdf257c93c863e9150c8621f55d8a7d8", "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef", - "sha256:ba0ec8659b8a3e411d5193481fb91650949247ea08f4f6d42928a180b547e2e5", - "sha256:1138a185b15c3035c617401f890836e98e8a519932ab2b3d0f33bb671af7ea89", - "sha256:7393394489e8a82dc917a09a0c0f4762ae7f86c5cd968e02167a9178ab2a76a6", - "sha256:20f0406ff70025c0e3597ee23bb00d42e4a8167698f7d67697c3a363cef2507d", - "sha256:a19b338cd13ebcfe9f39ef0247090af3d294b4349359ec52842e18b22bd87603" + "sha256:aa6729c1801b6eaa558d6c821d67fa8bfef183bdc8d4e4ff6eae54480891d5f9", + "sha256:4ffb92883a6c8b5068696efcae8b291dc449e97f05979f0957a1c9c2dffa7a9b", + "sha256:177290ae94ec9db5d37d7029619ebe50acdfe19f0acc88ac27e2f78d8d22712f", + "sha256:4d6437dcd2e02dd0390611b8ea3d4201da5ee251f878381f4e51119271fa0bfa", + "sha256:1bc0a4145d6dd5bdc3518f964be146ebf9dabe80b6b279aadc156b0d9ce52fd3" ] }, "DockerfileMD5": null, diff --git a/dvc.lock b/dvc.lock index 5b4eb912..3143baab 100644 --- a/dvc.lock +++ b/dvc.lock @@ -53,7 +53,7 @@ stages: outs: - path: .calkit/env-locks/tex.json hash: md5 - md5: 06c54a2e51a071a92c34d67ca4c72e01 + md5: cb8452ceb0b6f62d4a20a62d13da7b58 size: 1171 build-RE-paper: cmd: calkit xenv -n tex --no-check -- latexmk -cd -interaction=nonstopmode @@ -61,7 +61,7 @@ stages: deps: - path: .calkit/env-locks/tex.json hash: md5 - md5: 06c54a2e51a071a92c34d67ca4c72e01 + md5: cb8452ceb0b6f62d4a20a62d13da7b58 size: 1171 - path: pubs/elsarticle-num-names.bst hash: md5 @@ -97,7 +97,7 @@ stages: outs: - path: pubs/renewable-energy-mdo/mdocean.pdf hash: md5 - md5: 72be0e153c77b871ab126efbc6d53bd2 + md5: 11b71b2f40f26377f34e59ce9aa15199 size: 2797327 build-AOR-paper: cmd: calkit xenv -n tex --no-check -- latexmk -cd -interaction=nonstopmode @@ -105,7 +105,7 @@ stages: deps: - path: .calkit/env-locks/tex.json hash: md5 - md5: 06c54a2e51a071a92c34d67ca4c72e01 + md5: cb8452ceb0b6f62d4a20a62d13da7b58 size: 1171 - path: mdocean/simulation/modules/OpenFLASH/pubs/src/meem-appendix.tex hash: md5 @@ -135,5 +135,5 @@ stages: outs: - path: pubs/applied-ocean-research-model/main.pdf hash: md5 - md5: f7214fa064f90779e0d266ed29da999b + md5: 2dbaf0b1ca8e524ebda5c74f33bef7ef size: 3603527