Sync with main #65
Merged
Sync with main #65
Conversation
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
- Packaged code in virtual_ship package - Created pyproject.toml for project - Made tiny changes to code that were still on Emma's computer and not on github
- Added [dev] optional to package (pip install ".[dev]") - Added tools formatting & linting to the [dev] optional - Added script that runs these tools and applies fixes whenever able - Added CI that checks code using these tools - Adjusted code to pass checks (no functional changes)
Created test framework
Added test that runs sail_ship complete. No assertions yet; just to see if it runs.
Seperated Argo simulation as a seperate module in instruments/argo. Created test for it; similarly without assertions.
Added tests to CI. Full code coverage is not generated or uploaded anywhere yet. Just runs the tests and sees how that goes.
* wip drifters * drifters instrument. just missing test * drifter test * Remove old drifter file and fix errors * codetools * outputdf wherever i forgot to use it * added todo list * ctd instrument * CTDtest * use new ctd instrument in sailship * fix typo * codetools * use new parcels api for particle class * add ctd to init * comments * first try adcp * adcp test * use adcp instrument in sailship * cleanup * instrument ship s t * use ship st in sailship * cleanup * refactor sailship ctd cast * cleanup * large cleanup * add checks that all drifter and argo floats are deployed * comments * docstrings and other codetools fixes * rename SamplePoint to Spacetime and move them one dir up * rm todo * run pydocstyle on tests * fix some names * Update virtual_ship/instruments/ctd.py Co-authored-by: Erik van Sebille <erikvansebille@gmail.com> * removed comment about ctd * fix incorrect docstring * renamed ship_st to ship_underwater_st * remove sailship create fieldset commented out function * ship underway st docstring improvement * minor docstring change * minor docstring change --------- Co-authored-by: Erik van Sebille <erikvansebille@gmail.com>
* Implemented test for ship underwater st. Other tests will follow, but let's review this one so we agree on how to test. * Refactored and made ship underwater st work so it passes the test
* ADCP instrument cleanup and test * Ship ST instrument test improvements
Cleaned up CTD
Wrote test for CTD
Cleaned up Drifters Wrote test for Drifters
Cleanup argo float instrument Argo float instrument test
Added typing and initialization in python instead of from JSON. Added 'verify' function that somewhat performs the same verification as before. Some general cleanup and simplification in sailship function
* verify waypoints are on water * Make zero uv on land check a function * add test for sailship verify * comments
Add meta.yaml for conda. Very minimal but it builds the package. Does not provide development environment whatsoever, but Emma and me agreed it's not worth the effort to set that up when development with pip works fine. Remove old dependencies from pyproject.toml
Conversion of ADCP zarr to CSV-like file to make experience more realistic. Dummy function that can be filled in later to add noise. We don't add noise now because we want to focus on different parts of the software
--------- Co-authored-by: Erik van Sebille <erikvansebille@gmail.com> Co-authored-by: Vecko <36369090+VeckoTheGecko@users.noreply.github.com>
Collaborator
Author
|
@ammedd I'll need an approval to get this merged :') |
ammedd
approved these changes
Sep 25, 2024
Collaborator
ammedd
left a comment
ammedd
left a comment
There was a problem hiding this comment.
Looks good! Lets go ahead and do more tests later
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Related to #64