[DO NOT MERGE] Parcels-v4 integration for EDITO hackathon#220
Draft
erikvansebille wants to merge 47 commits intomainfrom
Draft
[DO NOT MERGE] Parcels-v4 integration for EDITO hackathon#220erikvansebille wants to merge 47 commits intomainfrom
erikvansebille wants to merge 47 commits intomainfrom
Conversation
Consolidates/unifies the old dual ship_config.yaml and schedule.yaml config files into one expedition.yaml file, in line with v1 dev objectives.
Fix unnecessarily divergent branches.
…ls dependency from parcels-v4 branch on github
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
- Define workspace with VirtualShip name and pixi-build preview - Configure multiple test environments (py310, py311, py312) - Set up feature environments for docs, typing, and pre-commit - Define pixi tasks for tests, docs, linting, and type checking - Align dependencies with existing pyproject.toml
- Replace mamba-org/setup-micromamba with prefix-dev/setup-pixi - Update test job to use pixi environments (test-py310, test-py312) - Update typechecking job to use pixi run typing - Enable pixi caching for faster CI runs - Simplify workflow by removing manual dependency installation
- Replace Conda-based development setup with Pixi - Add comprehensive Pixi workflows section with examples - Document testing, docs, and code quality commands - Include tips for environment management and CI reproduction - Update dependency management instructions to reference pixi.toml
Add Pixi badge to indicate project uses Pixi for environment management
Environment management is now handled by pixi.toml. The environment.yml file is no longer needed as all dependencies are defined in pixi.toml.
v4 of Parcels is 3.11+
for more information, see https://pre-commit.ci
Requires Parcels-code/Parcels#2348 to work
erikvansebille
changed the title
erikvansebille
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR implements some changes needed to get virtualshipcode to run with parcels v4, as part of the EDITO Model Lab hackathon. It is not aligned with the v1-refactoring/development though, so better to not merge. Also, better to manually copy some of the changes here to a new PR for proper v4-integration later, when Parcels-v4 is out of alpha stage
Perhaps the most important aspect is the creation of the FieldSet, which is surprisingly clean:
virtualship/src/virtualship/expedition/input_data.py
Lines 101 to 111 in 46a1ed6
Also note that, during this attempt to integrate virtualship and Parcels-v4, we also found some bugs/issues in Parcels-v4 itself: Parcels-code/Parcels#2348