Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c3c50c7
init the gantt chart
j-atkins Mar 12, 2026
b305d94
continue populating chart
j-atkins Mar 12, 2026
4d1c85c
further additions
j-atkins Mar 12, 2026
c1adbd8
first draft
j-atkins Mar 24, 2026
d8b7ab6
Merge branch 'main' into gantt
j-atkins Mar 24, 2026
b2b63ec
Merge branch 'main' into gantt
j-atkins Jun 2, 2026
07fb9f0
remove fuso
j-atkins Jun 2, 2026
a489014
modify/update gantt
j-atkins Jun 2, 2026
b8ae8aa
small tweaks
j-atkins Jun 5, 2026
1ae40f8
export chart to svg
j-atkins Jun 5, 2026
9f2da2b
CI: Enable mypy (#350)
VeckoTheGecko Jun 5, 2026
1014bc7
Merge branch 'main' into gantt
j-atkins Jun 5, 2026
e17c5e9
new dir for year plan
j-atkins Jun 5, 2026
a500497
remove gliders as distinct section
j-atkins Jun 5, 2026
8551744
update svg render
j-atkins Jun 5, 2026
5228873
add conferences, workshops
j-atkins Jun 5, 2026
9deaa8b
re-render svg
j-atkins Jun 5, 2026
4c7fd4f
init the gantt chart
j-atkins Mar 12, 2026
0f0f0ce
continue populating chart
j-atkins Mar 12, 2026
45292ff
further additions
j-atkins Mar 12, 2026
aa68ac0
first draft
j-atkins Mar 24, 2026
3fe69f5
remove fuso
j-atkins Jun 2, 2026
e2dea57
modify/update gantt
j-atkins Jun 2, 2026
cdffc6f
small tweaks
j-atkins Jun 5, 2026
475a2ec
export chart to svg
j-atkins Jun 5, 2026
5511a4d
new dir for year plan
j-atkins Jun 5, 2026
bb19260
remove gliders as distinct section
j-atkins Jun 5, 2026
4120348
update svg render
j-atkins Jun 5, 2026
0ad01a1
add conferences, workshops
j-atkins Jun 5, 2026
4297b68
re-render svg
j-atkins Jun 5, 2026
e0536a9
Merge branch 'gantt' of github.com:OceanParcels/virtualship into gantt
j-atkins Jun 5, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
51 changes: 25 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Member

@erikvansebille erikvansebille Jun 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rerender the svg?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

woops, good point!

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions docs/user-guide/developer-content/yearplan-26-27/gantt_2026-27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
```mermaid
---
config:
theme: default
---
%%{init: { 'themeVariables': {
'doneTaskBkgColor': '#d3d3d3',
'activeTaskBkgColor': '#85C1E9',
'taskBkgColor': '#F7DC6F',
'critBorderColor': '#ff0000'
}}}%%
gantt
title VirtualShip Year Plan, 2026 - 2027
dateFormat YYYY-MM-DD
tickInterval 3month
weekday monday

section NKO scale-up
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, 150d
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
[TUD] Atmosphere and Ocean Dynamics :active, 2026-11-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 UU courses
Comment thread
erikvansebille marked this conversation as resolved.
OSL :active, 2026-11-01, 30d
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
Comment thread
erikvansebille marked this conversation as resolved.
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
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. gliders, atmospheric) :done, 2026-08-01, 90d

```
11 changes: 10 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
30 changes: 30 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Loading