Skip to content

Merge develop into main#75

Draft
edvinskis wants to merge 51 commits into
mainfrom
develop
Draft

Merge develop into main#75
edvinskis wants to merge 51 commits into
mainfrom
develop

Conversation

@edvinskis

Copy link
Copy Markdown
Collaborator

Closes:

[TODO: List which issues]

Restructuring and Improvements:

  • Refactor System to TransportSystem throughout the docs, updated all references, and clarified parameter and method documentation to distinguish between TransportSystem (for spatially resolved models) and the new MixedSystem. This is also reflected in the documentation; docstrings and Quarto docs updated.

CI/CD and Coverage Reporting:

  • Updated the GitHub Actions workflow to generate an XML coverage report and automatically upload it to Codecov.

Other Minor Changes:

  • Added a project logo and various status badges (PyPI, Python version, CI, Codecov, License, Docs) to the README.md.
  • Added the logo to the documentation navbar and ensured the Quarto build directory is git-ignored.
  • Removed the .gitattributes rule for pixi.lock to avoid merge issues and unnecessary highlighting.

aysunrhn and others added 30 commits June 15, 2026 15:55
Instead of having standalone rhs functions for each system, the rhs is
defined as a method in the respective system class. The `_rhs` function
then only needs to call the method of the system object.
Otherwise, it does not render correctly when the font is not installed.
…ing in MC sampling in transport_with_pymc.ipynb
Split System into TransportSystem and MixedSystem

Closes #15 #49 #51
Add logo to the repository
Delete Pixi-related configuration and lock files (pixi.toml and generated pixi.lock). Cleans up repository by removing unused/generated dependency metadata and config for Pixi.
Merge `develop` into `36-add-badges`
Update CI workflow to generate and persist a coverage badge. Adds write permission for repository contents, installs genbadge, outputs an XML coverage report (reports/coverage/coverage.xml), generates badges/coverage-badge.svg, and commits/pushes the badge back to the repo on push events (uses a bot user and commits with "[skip ci]"). This keeps the coverage badge up-to-date from the workflow run.
edvinskis and others added 21 commits July 21, 2026 13:04
Insert project logo image at the top of README and update the main heading to a shorter form.
Add badges to README and update workflow
…efactoring-and-adding-new-test-suite

Update documentation
Fetch full repo history for the coverage workflow (fetch-depth: 0) so subsequent git operations have needed refs. Replace the staged-diff check with a --cached check that exits when there are no changes, then commit changes and run a git pull --rebase origin develop before pushing
CI: adjust coverage workflow checkout & push
Replace the custom badge generation and auto-commit with a codecov/codecov-action. Removed the permissions block, checkout fetch-depth override, genbadge installation, and the steps that generated/committed badges; workflow now uploads reports/coverage/coverage.xml to Codecov to simplify coverage reporting.
Update README badge to use Codecov (linking to the reactix repo on the develop branch) instead of the previous coverage image.
TODO: Make sure that units and parameter values are consistent
throughout the notebook.
Parameter values are now roughly oriented at the ones in Schijven et el.
(1999)

Schijven, J. F., Hoogenboezem, W., Hassanizadeh, M., & Peters, J. H. (1999). Modeling removal of bacteriophages MS2 and PRD1 by dune recharge at Castricum, Netherlands. Water Resources Research, 35(4), 1101–1111. https://doi.org/10.1029/1998WR900108
Integrate Codecov for coverage reporting and update badges
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants