From c3c50c72875be5b0c15c8ab37e4a893e9477dfca Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Thu, 12 Mar 2026 14:18:34 +0100 Subject: [PATCH 01/27] init the gantt chart --- .../developer-content/gantt_2026-27.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs/user-guide/developer-content/gantt_2026-27.md diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md new file mode 100644 index 000000000..ca5d364e3 --- /dev/null +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -0,0 +1,17 @@ +```mermaid +--- +config: + theme: default +--- +gantt + title VirtualShip Year Plan 2026-2027 + dateFormat YYYY-MM-DD + tickInterval 1month + weekday monday + + section NKO scale-up + Course inventory :a1, 2026-03-01, 7d + Showcases :after a1, 60d + Train-the-trainer content dev :a3, 2026-04-01, 60d + Train-the-trainer workshops :after a3, 80d +``` From b305d94c36c580b998f8532ceed0afec8a25aaaf Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Thu, 12 Mar 2026 14:49:39 +0100 Subject: [PATCH 02/27] continue populating chart --- .../developer-content/gantt_2026-27.md | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index ca5d364e3..d3ea8154a 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -3,15 +3,45 @@ config: theme: default --- +%%{init: { 'themeVariables': { + 'doneTaskBkgColor': '#d3d3d3', + 'activeTaskBkgColor': '#85C1E9', + 'taskBkgColor': '#F7DC6F', + 'critBorderColor': '#ff0000' +}}}%% gantt - title VirtualShip Year Plan 2026-2027 + title VirtualShip Year Plan, Spring 2026 - Spring 2027 dateFormat YYYY-MM-DD tickInterval 1month weekday monday section NKO scale-up - Course inventory :a1, 2026-03-01, 7d - Showcases :after a1, 60d - Train-the-trainer content dev :a3, 2026-04-01, 60d - Train-the-trainer workshops :after a3, 80d + Course inventory :active, 2026-03-01, 21d + Computing facilities inventory :active, 2026-03-14, 21d + Showcases :active, 2026-03-19, 50d + Train-the-trainer content dev :active, 2026-04-01, 91d + Train-the-trainer workshops :active, 2026-07-01, 62d + + section AWvB + Jamie :, 2026-07-31, 7d + + section UU courses + SWRM :active, 2026-09-01, 30d + OSL :active, 2026-11-01, 30d + OF :active, 2026-11-15, 30d + DyOc :active, 2027-02-15, 30d + + section Research projects + OSSE research :done, 2026-04-01, 153d + + section Papers + JOSS in review?! :active, 2026-04-01, 60d + DBR2 in prep. :active, 2026-03-01, 60d + + section Code dev + v1 dev :done, 2026-04-01, 153d + + section fUSO (highly tentative!!!) + <<< dev >>> :done, 2026-09-01, 198d + ``` From 4d1c85c2ac2f8a7253576a200a322e17eae1de0c Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Thu, 12 Mar 2026 15:05:13 +0100 Subject: [PATCH 03/27] further additions --- docs/user-guide/developer-content/gantt_2026-27.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index d3ea8154a..3b336dd2f 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -21,10 +21,15 @@ gantt Showcases :active, 2026-03-19, 50d Train-the-trainer content dev :active, 2026-04-01, 91d Train-the-trainer workshops :active, 2026-07-01, 62d + SWRM train-the-trainer :future, 2026-06-01, 30d section AWvB Jamie :, 2026-07-31, 7d + section Gliders + Filming (at NOC)? :done, 2026-05-01, 60d + Teaching material :done, 2026-07-01, 62d + section UU courses SWRM :active, 2026-09-01, 30d OSL :active, 2026-11-01, 30d @@ -39,9 +44,10 @@ gantt DBR2 in prep. :active, 2026-03-01, 60d section Code dev + ARGO_BGC :done, 2026-04-01, 35d v1 dev :done, 2026-04-01, 153d section fUSO (highly tentative!!!) - <<< dev >>> :done, 2026-09-01, 198d + <<< placeholder >>> :active, 2026-09-01, 198d ``` From c1adbd8f153f9441921b1b110a2c52e2f72c22c3 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Tue, 24 Mar 2026 14:31:54 +0000 Subject: [PATCH 04/27] first draft --- .../developer-content/gantt_2026-27.md | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 3b336dd2f..652ef3a51 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -10,18 +10,24 @@ config: 'critBorderColor': '#ff0000' }}}%% gantt - title VirtualShip Year Plan, Spring 2026 - Spring 2027 + title VirtualShip Year Plan, Spring 2026 - Spring/Summer 2027 dateFormat YYYY-MM-DD - tickInterval 1month + tickInterval 3month weekday monday section NKO scale-up - Course inventory :active, 2026-03-01, 21d - Computing facilities inventory :active, 2026-03-14, 21d + Course inventory :active, 2026-03-01, 30d + Computing facilities inventory :active, 2026-03-19, 50d Showcases :active, 2026-03-19, 50d Train-the-trainer content dev :active, 2026-04-01, 91d Train-the-trainer workshops :active, 2026-07-01, 62d SWRM train-the-trainer :future, 2026-06-01, 30d + [UvA] Biological Oceanography :active, 2026-12-01, 60d + [UvA] Benthic Ecosystems :active, 2027-01-01, 60d + [TUD] Physical Oceanography :active, 2026-09-01, 60d + [TUD] Atmosphere and Ocean Dynamics :active, 2026-11-01, 60d + [TUD] Research Methods in Marine Science :active, 2027-05-01, 60d + section AWvB Jamie :, 2026-07-31, 7d @@ -42,12 +48,15 @@ gantt section Papers JOSS in review?! :active, 2026-04-01, 60d DBR2 in prep. :active, 2026-03-01, 60d + Oceanogr. in prep. :active, 2026-03-01, 67d section Code dev ARGO_BGC :done, 2026-04-01, 35d + post-DyOc enhancements :done, 2026-04-01, 35d v1 dev :done, 2026-04-01, 153d - section fUSO (highly tentative!!!) - <<< placeholder >>> :active, 2026-09-01, 198d + + section fUSO (highly tentative) + <<< placeholder >>> :active, 2026-09-01, 365d ``` From 07fb9f0289ae34b4a90d3367d21c7b564c4f8855 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Tue, 2 Jun 2026 10:11:13 +0200 Subject: [PATCH 05/27] remove fuso --- docs/user-guide/developer-content/gantt_2026-27.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 652ef3a51..6a1eb6927 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -55,8 +55,4 @@ gantt post-DyOc enhancements :done, 2026-04-01, 35d v1 dev :done, 2026-04-01, 153d - - section fUSO (highly tentative) - <<< placeholder >>> :active, 2026-09-01, 365d - ``` From a4890141520786cf2eed07f1c6712d558858af50 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Tue, 2 Jun 2026 10:29:01 +0200 Subject: [PATCH 06/27] modify/update gantt --- .../developer-content/gantt_2026-27.md | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 6a1eb6927..276dbe637 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -10,7 +10,7 @@ config: 'critBorderColor': '#ff0000' }}}%% gantt - title VirtualShip Year Plan, Spring 2026 - Spring/Summer 2027 + title VirtualShip Year Plan, 2026 - 2027 dateFormat YYYY-MM-DD tickInterval 3month weekday monday @@ -19,22 +19,29 @@ gantt Course inventory :active, 2026-03-01, 30d Computing facilities inventory :active, 2026-03-19, 50d Showcases :active, 2026-03-19, 50d - Train-the-trainer content dev :active, 2026-04-01, 91d - Train-the-trainer workshops :active, 2026-07-01, 62d - SWRM train-the-trainer :future, 2026-06-01, 30d + Train-the-trainer content dev :active, 2026-04-01, 150d + Train-the-trainer workshops :active, 2026-08-01, 62d + SWRM (UU-internal) train-the-trainer :future, 2026-08-01, 60d [UvA] Biological Oceanography :active, 2026-12-01, 60d [UvA] Benthic Ecosystems :active, 2027-01-01, 60d [TUD] Physical Oceanography :active, 2026-09-01, 60d [TUD] Atmosphere and Ocean Dynamics :active, 2026-11-01, 60d - [TUD] Research Methods in Marine Science :active, 2027-05-01, 60d + [WUR] Research Methods in Marine Science :active, 2027-05-01, 60d + [RUG] Introductory Course in Biological Oceanography :active, 2027-09-01, 60d + [RUG] Marine Biology :active, 2027-11-01, 60d + + section Real-life expeditions + Jamie (AWvB) :, 2026-07-31, 7d + Gonçalo (AWvB) :, 2026-07-31, 7d + Gonçalo (AWvB) :, 2026-06-22, 7d + Emma (AWvB) :, 2026-06-22, 7d + Gonçalo (NOC) :, 2026-11-01, 7d + - section AWvB - Jamie :, 2026-07-31, 7d section Gliders - Filming (at NOC)? :done, 2026-05-01, 60d - Teaching material :done, 2026-07-01, 62d + <<>> :done, 2027-01-01, 92d section UU courses SWRM :active, 2026-09-01, 30d @@ -42,17 +49,17 @@ gantt OF :active, 2026-11-15, 30d DyOc :active, 2027-02-15, 30d - section Research projects - OSSE research :done, 2026-04-01, 153d - section Papers - JOSS in review?! :active, 2026-04-01, 60d - DBR2 in prep. :active, 2026-03-01, 60d - Oceanogr. in prep. :active, 2026-03-01, 67d + JOSS in review?! :active, 2026-04-01, 150d + DBR2 in prep. :active, 2026-03-01, 90d + Oceanogr. in prep. :active, 2026-03-01, 70d + OSSE-MHW :active, 2026-05-01, 180d + section Code dev - ARGO_BGC :done, 2026-04-01, 35d + v0.3 enhancements (new sensors on instruments etc.) :done, 2026-06-01, 35d post-DyOc enhancements :done, 2026-04-01, 35d - v1 dev :done, 2026-04-01, 153d + v1 dev :done, 2026-05-01, 90d + v1 enhancements (new instruments, e.g. atmospheric) :done, 2026-08-01, 90d ``` From b8ae8aa64e9e0b567ccd273344fc9c0cd6c7080b Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 10:24:16 +0200 Subject: [PATCH 07/27] small tweaks --- docs/user-guide/developer-content/gantt_2026-27.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 276dbe637..ecda749b8 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -20,8 +20,8 @@ gantt Computing facilities inventory :active, 2026-03-19, 50d Showcases :active, 2026-03-19, 50d Train-the-trainer content dev :active, 2026-04-01, 150d - Train-the-trainer workshops :active, 2026-08-01, 62d - SWRM (UU-internal) train-the-trainer :future, 2026-08-01, 60d + First train-the-trainer workshops :active, 2026-08-01, 62d + SWRM (UU-internal) train-the-trainer :done, 2026-10-01, 60d [UvA] Biological Oceanography :active, 2026-12-01, 60d [UvA] Benthic Ecosystems :active, 2027-01-01, 60d [TUD] Physical Oceanography :active, 2026-09-01, 60d @@ -37,14 +37,10 @@ gantt Emma (AWvB) :, 2026-06-22, 7d Gonçalo (NOC) :, 2026-11-01, 7d - - - section Gliders - <<>> :done, 2027-01-01, 92d + <<< Tentative >>> :done, 2027-01-01, 92d section UU courses - SWRM :active, 2026-09-01, 30d OSL :active, 2026-11-01, 30d OF :active, 2026-11-15, 30d DyOc :active, 2027-02-15, 30d From 1ae40f88a214601cadf53c44bc9b9fa20041221d Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 11:13:55 +0200 Subject: [PATCH 08/27] export chart to svg --- docs/user-guide/developer-content/gantt_2026-27-1.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/user-guide/developer-content/gantt_2026-27-1.svg diff --git a/docs/user-guide/developer-content/gantt_2026-27-1.svg b/docs/user-guide/developer-content/gantt_2026-27-1.svg new file mode 100644 index 000000000..7faf9c33a --- /dev/null +++ b/docs/user-guide/developer-content/gantt_2026-27-1.svg @@ -0,0 +1 @@ +2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems <<< Tentative >>> DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsGlidersUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 From 9f2da2bd7e33412ef3a015adcd7b7c6459404348 Mon Sep 17 00:00:00 2001 From: Nick Hodgskin <36369090+VeckoTheGecko@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:41:31 +0200 Subject: [PATCH 09/27] CI: Enable mypy (#350) * CI: Enable mypy * Run Zizmor zizmor .github --gh-token $(gh auth token) --fix=unsafe-only --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 51 ++++++++++++++++++++-------------------- pixi.toml | 11 ++++++++- pyproject.toml | 30 +++++++++++++++++++++++ 4 files changed, 66 insertions(+), 28 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 0b5dd555b..d5ff1dd64 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -34,7 +34,7 @@ jobs: fetch-depth: 0 persist-credentials: false - - uses: hynek/build-and-inspect-python-package@fe0a0fb1925ca263d076ca4f2c13e93a6e92a33e # v2 + - uses: hynek/build-and-inspect-python-package@fe0a0fb1925ca263d076ca4f2c13e93a6e92a33e # v2.17.0 publish: needs: [dist] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b82050f0..1f8f1402d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,29 +93,28 @@ jobs: - name: Run zizmor uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2 - -# typechecking: -# name: "TypeChecking: pixi run typing" -# runs-on: ubuntu-latest -# if: false -# needs: cache-pixi-lock -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# - uses: Parcels-code/pixi-lock/restore@38495788b79a5ff26009aecc15daa9a8310b8832 # v0.1.0 -# with: -# cache-key: ${{ needs.cache-pixi-lock.outputs.cache-key }} -# - uses: prefix-dev/setup-pixi@v0.9.4 -# with: -# cache: true -# pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }} -# cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }} -# - name: Typechecking -# run: pixi run typing --non-interactive --html-report mypy-report -# - name: Upload test results -# if: ${{ always() }} # Upload even on mypy error -# uses: actions/upload-artifact@v4 -# with: -# name: Mypy report -# path: mypy-report + typechecking: + name: "TypeChecking: pixi run typing" + runs-on: ubuntu-latest + needs: cache-pixi-lock + steps: + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + fetch-depth: 0 + persist-credentials: false + - uses: Parcels-code/pixi-lock/restore@38495788b79a5ff26009aecc15daa9a8310b8832 # v0.1.0 + with: + cache-key: ${{ needs.cache-pixi-lock.outputs.cache-key }} + - uses: prefix-dev/setup-pixi@a0af7a228712d6121d37aba47adf55c1332c9c2e # v0.9.4 + with: + cache: true + pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }} + cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }} + - name: Typechecking + run: pixi run typing --non-interactive --html-report mypy-report + - name: Upload test results + if: ${{ always() }} # Upload even on mypy error + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: Mypy report + path: mypy-report diff --git a/pixi.toml b/pixi.toml index ba0249687..828c2da37 100644 --- a/pixi.toml +++ b/pixi.toml @@ -93,12 +93,21 @@ lint = "pre-commit run --all-files" [feature.typing.dependencies] mypy = "*" lxml = "*" +pandas-stubs="*" +types-PyYAML="*" +scipy-stubs="*" +types-openpyxl = "*" +types-psutil = "*" +types-python-dateutil = "*" + +[feature.typing.pypi-dependencies] +types-xlrd = "*" [feature.typing.tasks] typing = "mypy src/virtualship --install-types" [environments] -default = { features = ["test", "notebooks", "typing", "pre-commit", "analysis"] } +default = { features = ["test", "notebooks", "typing", "pre-commit", "analysis"] } test-latest = { features = ["test"], solve-group = "test" } test-py310 = { features = ["test", "py310"] } test-py311 = { features = ["test", "py311"] } diff --git a/pyproject.toml b/pyproject.toml index 7f9a2108a..2595779a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -117,3 +117,33 @@ ignore = [ # TODO: Remove later "D100", "D103" ] + + +[tool.mypy] +files = ['src'] +disable_error_code = "import-untyped" +check_untyped_defs = true +show_error_context = true +warn_redundant_casts = true +warn_unused_configs = true +warn_unused_ignores = true + +exclude = [ + # Temporarily exclude files. As we improve typechecking across the codebase, remove these + "src/virtualship/cli/_plan.py", + "src/virtualship/cli/_run.py", + "src/virtualship/cli/commands.py", + "src/virtualship/cli/validator_utils.py", + "src/virtualship/expedition/simulate_schedule.py", + "src/virtualship/instruments/adcp.py", + "src/virtualship/instruments/argo_float.py", + "src/virtualship/instruments/base.py", + "src/virtualship/instruments/ctd.py", + "src/virtualship/instruments/drifter.py", + "src/virtualship/instruments/ship_underwater_st.py", + "src/virtualship/instruments/xbt.py", + "src/virtualship/make_realistic/problems/simulator.py", + "src/virtualship/models/checkpoint.py", + "src/virtualship/models/expedition.py", + "src/virtualship/utils.py", +] From e17c5e9d95eb73664c4faf7e475f6f7fc2d03ab7 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:57:07 +0200 Subject: [PATCH 10/27] new dir for year plan --- .../developer-content/{ => yearplan-26-27}/gantt_2026-27-1.svg | 0 .../developer-content/{ => yearplan-26-27}/gantt_2026-27.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docs/user-guide/developer-content/{ => yearplan-26-27}/gantt_2026-27-1.svg (100%) rename docs/user-guide/developer-content/{ => yearplan-26-27}/gantt_2026-27.md (100%) diff --git a/docs/user-guide/developer-content/gantt_2026-27-1.svg b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg similarity index 100% rename from docs/user-guide/developer-content/gantt_2026-27-1.svg rename to docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md similarity index 100% rename from docs/user-guide/developer-content/gantt_2026-27.md rename to docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md From a5004972b8010e6c1e1cc04e93e669cab504d936 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:58:29 +0200 Subject: [PATCH 11/27] remove gliders as distinct section --- .../developer-content/yearplan-26-27/gantt_2026-27.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md index ecda749b8..1f0e78414 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md @@ -37,9 +37,6 @@ gantt Emma (AWvB) :, 2026-06-22, 7d Gonçalo (NOC) :, 2026-11-01, 7d - section Gliders - <<< Tentative >>> :done, 2027-01-01, 92d - section UU courses OSL :active, 2026-11-01, 30d OF :active, 2026-11-15, 30d @@ -56,6 +53,6 @@ gantt v0.3 enhancements (new sensors on instruments etc.) :done, 2026-06-01, 35d post-DyOc enhancements :done, 2026-04-01, 35d v1 dev :done, 2026-05-01, 90d - v1 enhancements (new instruments, e.g. atmospheric) :done, 2026-08-01, 90d + v1 enhancements (new instruments, e.g. gliders, atmospheric) :done, 2026-08-01, 90d ``` From 8551744b66109f536e679e63a6036f514aa59824 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:59:33 +0200 Subject: [PATCH 12/27] update svg render --- .../developer-content/yearplan-26-27/gantt_2026-27-1.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg index 7faf9c33a..b3db70ab4 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg @@ -1 +1 @@ -2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems <<< Tentative >>> DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsGlidersUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 +2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. gliders, atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 From 52288733514b0ea94e337f3561c8e0912ad60647 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:40:42 +0200 Subject: [PATCH 13/27] add conferences, workshops --- .../developer-content/yearplan-26-27/gantt_2026-27.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md index 1f0e78414..39683e0c5 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md @@ -42,6 +42,13 @@ gantt OF :active, 2026-11-15, 30d DyOc :active, 2027-02-15, 30d + section Conferences and workshops + EGU :, 2027-04-15, 20d + NAC :, 2027-03-15, 20d + EMBRACER Researcher training :, 2026-12-01, 20d + Open Science Festival :, 2026-10-01, 20d + National Ocean Sciences :, 2026-06-08, 20d + section Papers JOSS in review?! :active, 2026-04-01, 150d DBR2 in prep. :active, 2026-03-01, 90d From 9deaa8bc938c293540052120574b229fd072dfad Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:49:47 +0200 Subject: [PATCH 14/27] re-render svg --- .../developer-content/yearplan-26-27/gantt_2026-27-1.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg index b3db70ab4..591a1b6d5 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg @@ -1 +1 @@ -2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. gliders, atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 +2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) National Ocean Sciences Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. gliders, atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer Open Science Festival [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography EMBRACER Researcher training [UvA] Benthic Ecosystems DyOc NAC EGU [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsUU coursesConferences and workshopsPapersCode devVirtualShip Year Plan, 2026 - 2027 From 4c7fd4fdb467658d4a8d94eef320674ce21d5e55 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Thu, 12 Mar 2026 14:18:34 +0100 Subject: [PATCH 15/27] init the gantt chart --- .../developer-content/gantt_2026-27.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs/user-guide/developer-content/gantt_2026-27.md diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md new file mode 100644 index 000000000..ca5d364e3 --- /dev/null +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -0,0 +1,17 @@ +```mermaid +--- +config: + theme: default +--- +gantt + title VirtualShip Year Plan 2026-2027 + dateFormat YYYY-MM-DD + tickInterval 1month + weekday monday + + section NKO scale-up + Course inventory :a1, 2026-03-01, 7d + Showcases :after a1, 60d + Train-the-trainer content dev :a3, 2026-04-01, 60d + Train-the-trainer workshops :after a3, 80d +``` From 0f0f0ce8a8132a409ebd9a47883419a1af8bcfab Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Thu, 12 Mar 2026 14:49:39 +0100 Subject: [PATCH 16/27] continue populating chart --- .../developer-content/gantt_2026-27.md | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index ca5d364e3..d3ea8154a 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -3,15 +3,45 @@ config: theme: default --- +%%{init: { 'themeVariables': { + 'doneTaskBkgColor': '#d3d3d3', + 'activeTaskBkgColor': '#85C1E9', + 'taskBkgColor': '#F7DC6F', + 'critBorderColor': '#ff0000' +}}}%% gantt - title VirtualShip Year Plan 2026-2027 + title VirtualShip Year Plan, Spring 2026 - Spring 2027 dateFormat YYYY-MM-DD tickInterval 1month weekday monday section NKO scale-up - Course inventory :a1, 2026-03-01, 7d - Showcases :after a1, 60d - Train-the-trainer content dev :a3, 2026-04-01, 60d - Train-the-trainer workshops :after a3, 80d + Course inventory :active, 2026-03-01, 21d + Computing facilities inventory :active, 2026-03-14, 21d + Showcases :active, 2026-03-19, 50d + Train-the-trainer content dev :active, 2026-04-01, 91d + Train-the-trainer workshops :active, 2026-07-01, 62d + + section AWvB + Jamie :, 2026-07-31, 7d + + section UU courses + SWRM :active, 2026-09-01, 30d + OSL :active, 2026-11-01, 30d + OF :active, 2026-11-15, 30d + DyOc :active, 2027-02-15, 30d + + section Research projects + OSSE research :done, 2026-04-01, 153d + + section Papers + JOSS in review?! :active, 2026-04-01, 60d + DBR2 in prep. :active, 2026-03-01, 60d + + section Code dev + v1 dev :done, 2026-04-01, 153d + + section fUSO (highly tentative!!!) + <<< dev >>> :done, 2026-09-01, 198d + ``` From 45292fff86e0e49da76ce00bab3bec1016e5a0e8 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Thu, 12 Mar 2026 15:05:13 +0100 Subject: [PATCH 17/27] further additions --- docs/user-guide/developer-content/gantt_2026-27.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index d3ea8154a..3b336dd2f 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -21,10 +21,15 @@ gantt Showcases :active, 2026-03-19, 50d Train-the-trainer content dev :active, 2026-04-01, 91d Train-the-trainer workshops :active, 2026-07-01, 62d + SWRM train-the-trainer :future, 2026-06-01, 30d section AWvB Jamie :, 2026-07-31, 7d + section Gliders + Filming (at NOC)? :done, 2026-05-01, 60d + Teaching material :done, 2026-07-01, 62d + section UU courses SWRM :active, 2026-09-01, 30d OSL :active, 2026-11-01, 30d @@ -39,9 +44,10 @@ gantt DBR2 in prep. :active, 2026-03-01, 60d section Code dev + ARGO_BGC :done, 2026-04-01, 35d v1 dev :done, 2026-04-01, 153d section fUSO (highly tentative!!!) - <<< dev >>> :done, 2026-09-01, 198d + <<< placeholder >>> :active, 2026-09-01, 198d ``` From aa68ac0563dd2add3d68e750ca294400a3a4c53a Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Tue, 24 Mar 2026 14:31:54 +0000 Subject: [PATCH 18/27] first draft --- .../developer-content/gantt_2026-27.md | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 3b336dd2f..652ef3a51 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -10,18 +10,24 @@ config: 'critBorderColor': '#ff0000' }}}%% gantt - title VirtualShip Year Plan, Spring 2026 - Spring 2027 + title VirtualShip Year Plan, Spring 2026 - Spring/Summer 2027 dateFormat YYYY-MM-DD - tickInterval 1month + tickInterval 3month weekday monday section NKO scale-up - Course inventory :active, 2026-03-01, 21d - Computing facilities inventory :active, 2026-03-14, 21d + Course inventory :active, 2026-03-01, 30d + Computing facilities inventory :active, 2026-03-19, 50d Showcases :active, 2026-03-19, 50d Train-the-trainer content dev :active, 2026-04-01, 91d Train-the-trainer workshops :active, 2026-07-01, 62d SWRM train-the-trainer :future, 2026-06-01, 30d + [UvA] Biological Oceanography :active, 2026-12-01, 60d + [UvA] Benthic Ecosystems :active, 2027-01-01, 60d + [TUD] Physical Oceanography :active, 2026-09-01, 60d + [TUD] Atmosphere and Ocean Dynamics :active, 2026-11-01, 60d + [TUD] Research Methods in Marine Science :active, 2027-05-01, 60d + section AWvB Jamie :, 2026-07-31, 7d @@ -42,12 +48,15 @@ gantt section Papers JOSS in review?! :active, 2026-04-01, 60d DBR2 in prep. :active, 2026-03-01, 60d + Oceanogr. in prep. :active, 2026-03-01, 67d section Code dev ARGO_BGC :done, 2026-04-01, 35d + post-DyOc enhancements :done, 2026-04-01, 35d v1 dev :done, 2026-04-01, 153d - section fUSO (highly tentative!!!) - <<< placeholder >>> :active, 2026-09-01, 198d + + section fUSO (highly tentative) + <<< placeholder >>> :active, 2026-09-01, 365d ``` From 3fe69f50228b720254b5c778a071de4e4549b3be Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Tue, 2 Jun 2026 10:11:13 +0200 Subject: [PATCH 19/27] remove fuso --- docs/user-guide/developer-content/gantt_2026-27.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 652ef3a51..6a1eb6927 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -55,8 +55,4 @@ gantt post-DyOc enhancements :done, 2026-04-01, 35d v1 dev :done, 2026-04-01, 153d - - section fUSO (highly tentative) - <<< placeholder >>> :active, 2026-09-01, 365d - ``` From e2dea575c5d5980ba2e2b8a869ab95051d684dff Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Tue, 2 Jun 2026 10:29:01 +0200 Subject: [PATCH 20/27] modify/update gantt --- .../developer-content/gantt_2026-27.md | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 6a1eb6927..276dbe637 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -10,7 +10,7 @@ config: 'critBorderColor': '#ff0000' }}}%% gantt - title VirtualShip Year Plan, Spring 2026 - Spring/Summer 2027 + title VirtualShip Year Plan, 2026 - 2027 dateFormat YYYY-MM-DD tickInterval 3month weekday monday @@ -19,22 +19,29 @@ gantt Course inventory :active, 2026-03-01, 30d Computing facilities inventory :active, 2026-03-19, 50d Showcases :active, 2026-03-19, 50d - Train-the-trainer content dev :active, 2026-04-01, 91d - Train-the-trainer workshops :active, 2026-07-01, 62d - SWRM train-the-trainer :future, 2026-06-01, 30d + Train-the-trainer content dev :active, 2026-04-01, 150d + Train-the-trainer workshops :active, 2026-08-01, 62d + SWRM (UU-internal) train-the-trainer :future, 2026-08-01, 60d [UvA] Biological Oceanography :active, 2026-12-01, 60d [UvA] Benthic Ecosystems :active, 2027-01-01, 60d [TUD] Physical Oceanography :active, 2026-09-01, 60d [TUD] Atmosphere and Ocean Dynamics :active, 2026-11-01, 60d - [TUD] Research Methods in Marine Science :active, 2027-05-01, 60d + [WUR] Research Methods in Marine Science :active, 2027-05-01, 60d + [RUG] Introductory Course in Biological Oceanography :active, 2027-09-01, 60d + [RUG] Marine Biology :active, 2027-11-01, 60d + + section Real-life expeditions + Jamie (AWvB) :, 2026-07-31, 7d + Gonçalo (AWvB) :, 2026-07-31, 7d + Gonçalo (AWvB) :, 2026-06-22, 7d + Emma (AWvB) :, 2026-06-22, 7d + Gonçalo (NOC) :, 2026-11-01, 7d + - section AWvB - Jamie :, 2026-07-31, 7d section Gliders - Filming (at NOC)? :done, 2026-05-01, 60d - Teaching material :done, 2026-07-01, 62d + <<>> :done, 2027-01-01, 92d section UU courses SWRM :active, 2026-09-01, 30d @@ -42,17 +49,17 @@ gantt OF :active, 2026-11-15, 30d DyOc :active, 2027-02-15, 30d - section Research projects - OSSE research :done, 2026-04-01, 153d - section Papers - JOSS in review?! :active, 2026-04-01, 60d - DBR2 in prep. :active, 2026-03-01, 60d - Oceanogr. in prep. :active, 2026-03-01, 67d + JOSS in review?! :active, 2026-04-01, 150d + DBR2 in prep. :active, 2026-03-01, 90d + Oceanogr. in prep. :active, 2026-03-01, 70d + OSSE-MHW :active, 2026-05-01, 180d + section Code dev - ARGO_BGC :done, 2026-04-01, 35d + v0.3 enhancements (new sensors on instruments etc.) :done, 2026-06-01, 35d post-DyOc enhancements :done, 2026-04-01, 35d - v1 dev :done, 2026-04-01, 153d + v1 dev :done, 2026-05-01, 90d + v1 enhancements (new instruments, e.g. atmospheric) :done, 2026-08-01, 90d ``` From cdffc6fe30733670d7ccd12d2c8e370300b2a036 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 10:24:16 +0200 Subject: [PATCH 21/27] small tweaks --- docs/user-guide/developer-content/gantt_2026-27.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/gantt_2026-27.md index 276dbe637..ecda749b8 100644 --- a/docs/user-guide/developer-content/gantt_2026-27.md +++ b/docs/user-guide/developer-content/gantt_2026-27.md @@ -20,8 +20,8 @@ gantt Computing facilities inventory :active, 2026-03-19, 50d Showcases :active, 2026-03-19, 50d Train-the-trainer content dev :active, 2026-04-01, 150d - Train-the-trainer workshops :active, 2026-08-01, 62d - SWRM (UU-internal) train-the-trainer :future, 2026-08-01, 60d + First train-the-trainer workshops :active, 2026-08-01, 62d + SWRM (UU-internal) train-the-trainer :done, 2026-10-01, 60d [UvA] Biological Oceanography :active, 2026-12-01, 60d [UvA] Benthic Ecosystems :active, 2027-01-01, 60d [TUD] Physical Oceanography :active, 2026-09-01, 60d @@ -37,14 +37,10 @@ gantt Emma (AWvB) :, 2026-06-22, 7d Gonçalo (NOC) :, 2026-11-01, 7d - - - section Gliders - <<>> :done, 2027-01-01, 92d + <<< Tentative >>> :done, 2027-01-01, 92d section UU courses - SWRM :active, 2026-09-01, 30d OSL :active, 2026-11-01, 30d OF :active, 2026-11-15, 30d DyOc :active, 2027-02-15, 30d From 475a2ec678c26ca6a9f9c05802e7fc6df2c9b34b Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 11:13:55 +0200 Subject: [PATCH 22/27] export chart to svg --- docs/user-guide/developer-content/gantt_2026-27-1.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/user-guide/developer-content/gantt_2026-27-1.svg diff --git a/docs/user-guide/developer-content/gantt_2026-27-1.svg b/docs/user-guide/developer-content/gantt_2026-27-1.svg new file mode 100644 index 000000000..7faf9c33a --- /dev/null +++ b/docs/user-guide/developer-content/gantt_2026-27-1.svg @@ -0,0 +1 @@ +2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems <<< Tentative >>> DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsGlidersUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 From 5511a4d35117e86357dc1503396a17456ce04b6f Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:57:07 +0200 Subject: [PATCH 23/27] new dir for year plan --- .../developer-content/{ => yearplan-26-27}/gantt_2026-27-1.svg | 0 .../developer-content/{ => yearplan-26-27}/gantt_2026-27.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docs/user-guide/developer-content/{ => yearplan-26-27}/gantt_2026-27-1.svg (100%) rename docs/user-guide/developer-content/{ => yearplan-26-27}/gantt_2026-27.md (100%) diff --git a/docs/user-guide/developer-content/gantt_2026-27-1.svg b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg similarity index 100% rename from docs/user-guide/developer-content/gantt_2026-27-1.svg rename to docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg diff --git a/docs/user-guide/developer-content/gantt_2026-27.md b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md similarity index 100% rename from docs/user-guide/developer-content/gantt_2026-27.md rename to docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md From bb192608c3c5045f8324d50be95d49e386e45779 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:58:29 +0200 Subject: [PATCH 24/27] remove gliders as distinct section --- .../developer-content/yearplan-26-27/gantt_2026-27.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md index ecda749b8..1f0e78414 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md @@ -37,9 +37,6 @@ gantt Emma (AWvB) :, 2026-06-22, 7d Gonçalo (NOC) :, 2026-11-01, 7d - section Gliders - <<< Tentative >>> :done, 2027-01-01, 92d - section UU courses OSL :active, 2026-11-01, 30d OF :active, 2026-11-15, 30d @@ -56,6 +53,6 @@ gantt v0.3 enhancements (new sensors on instruments etc.) :done, 2026-06-01, 35d post-DyOc enhancements :done, 2026-04-01, 35d v1 dev :done, 2026-05-01, 90d - v1 enhancements (new instruments, e.g. atmospheric) :done, 2026-08-01, 90d + v1 enhancements (new instruments, e.g. gliders, atmospheric) :done, 2026-08-01, 90d ``` From 412034863809f0aac37cdef05912e70c8ff39753 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:59:33 +0200 Subject: [PATCH 25/27] update svg render --- .../developer-content/yearplan-26-27/gantt_2026-27-1.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg index 7faf9c33a..b3db70ab4 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg @@ -1 +1 @@ -2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems <<< Tentative >>> DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsGlidersUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 +2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. gliders, atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 From 0ad01a11b06ae8681468551d92c791234bc86de0 Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:40:42 +0200 Subject: [PATCH 26/27] add conferences, workshops --- .../developer-content/yearplan-26-27/gantt_2026-27.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md index 1f0e78414..39683e0c5 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md @@ -42,6 +42,13 @@ gantt OF :active, 2026-11-15, 30d DyOc :active, 2027-02-15, 30d + section Conferences and workshops + EGU :, 2027-04-15, 20d + NAC :, 2027-03-15, 20d + EMBRACER Researcher training :, 2026-12-01, 20d + Open Science Festival :, 2026-10-01, 20d + National Ocean Sciences :, 2026-06-08, 20d + section Papers JOSS in review?! :active, 2026-04-01, 150d DBR2 in prep. :active, 2026-03-01, 90d From 4297b686028388cd8713a858942c8436a14056ec Mon Sep 17 00:00:00 2001 From: j-atkins <106238905+j-atkins@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:49:47 +0200 Subject: [PATCH 27/27] re-render svg --- .../developer-content/yearplan-26-27/gantt_2026-27-1.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg index b3db70ab4..591a1b6d5 100644 --- a/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg +++ b/docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27-1.svg @@ -1 +1 @@ -2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. gliders, atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography [UvA] Benthic Ecosystems DyOc [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsUU coursesPapersCode devVirtualShip Year Plan, 2026 - 2027 +2026-04-012026-07-012026-10-012027-01-012027-04-012027-07-012027-10-01Course inventory DBR2 in prep. Oceanogr. in prep. Computing facilities inventory Showcases Train-the-trainer content dev JOSS in review?! post-DyOc enhancements OSSE-MHW v1 dev v0.3 enhancements (new sensors on instruments etc.) National Ocean Sciences Gonçalo (AWvB) Emma (AWvB) Jamie (AWvB) Gonçalo (AWvB) First train-the-trainer workshops v1 enhancements (new instruments, e.g. gliders, atmospheric) [TUD] Physical Oceanography SWRM (UU-internal) train-the-trainer Open Science Festival [TUD] Atmosphere and Ocean Dynamics Gonçalo (NOC) OSL OF [UvA] Biological Oceanography EMBRACER Researcher training [UvA] Benthic Ecosystems DyOc NAC EGU [WUR] Research Methods in Marine Science [RUG] Introductory Course in Biological Oceanography [RUG] Marine Biology NKO scale-upReal-life expeditionsUU coursesConferences and workshopsPapersCode devVirtualShip Year Plan, 2026 - 2027