Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(createpackages): use jinja for mf6 module code generation #2333

Open
wants to merge 73 commits into
base: develop
Choose a base branch
from
Open

refactor(createpackages): use jinja for mf6 module code generation #2333

wants to merge 73 commits into from

Commits on Nov 14, 2024

  1. refactor(createpackages): use jinja for mf6 module code generation

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    7b5ceac View commit details
    Browse the repository at this point in the history

  2. add templates to package-data, misc

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    cff9b2a View commit details
    Browse the repository at this point in the history

  3. shim fixes

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    2cbc3fc View commit details
    Browse the repository at this point in the history

  4. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    6c952a3 View commit details
    Browse the repository at this point in the history

  5. appease codacy

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    028ffc3 View commit details
    Browse the repository at this point in the history

  6. remove unneeded imports from context template

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    394092a View commit details
    Browse the repository at this point in the history

  7. remove unneeded conditional from init template

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    fc3997c View commit details
    Browse the repository at this point in the history

  8. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    1da40a5 View commit details
    Browse the repository at this point in the history

  9. fix codegen tests

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    8f05049 View commit details
    Browse the repository at this point in the history

  10. fix job name in rtd.yml

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    2670545 View commit details
    Browse the repository at this point in the history

  11. import Union

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    675d8d6 View commit details
    Browse the repository at this point in the history

  12. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    5fffef5 View commit details
    Browse the repository at this point in the history

  13. correction

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e840520 View commit details
    Browse the repository at this point in the history

  14. shim fixes

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    80b54fc View commit details
    Browse the repository at this point in the history

  15. hacky shim fix

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    1d6786e View commit details
    Browse the repository at this point in the history

  16. ruff

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    fa24af3 View commit details
    Browse the repository at this point in the history

  17. restructuring, passing more tests 

    * move common var replacements and composite var inflation to dfn load
* misc fixes to the shim
    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    2c545c2 View commit details
    Browse the repository at this point in the history

  18. ruff

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    edcca13 View commit details
    Browse the repository at this point in the history

  19. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b6644ac View commit details
    Browse the repository at this point in the history

  20. docstring fixes

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3ffbc5d View commit details
    Browse the repository at this point in the history

  21. restore test_generate_classes.py

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e06ce4a View commit details
    Browse the repository at this point in the history

  22. 3.9 syntax?

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    f459746 View commit details
    Browse the repository at this point in the history

  23. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    baabcd8 View commit details
    Browse the repository at this point in the history

  24. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    ff96c7f View commit details
    Browse the repository at this point in the history

  25. docs/comments

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    00a227f View commit details
    Browse the repository at this point in the history

  26. backcompat fix?

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3adedda View commit details
    Browse the repository at this point in the history

  27. remove unused statement, fix mermaid diagrams in mf6_dev_guide, add b… 

    …oltons to readme
    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    214823d View commit details
    Browse the repository at this point in the history

  28. bound boltons >= 1

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    2d97e4f View commit details
    Browse the repository at this point in the history

  29. hints

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    128b0c2 View commit details
    Browse the repository at this point in the history

  30. Moving code from shim to jinja 

    Removed qual_base
Removed load and attrs, moved it to model, package and simulation.
    @deltamarnix @wpbonelli
    deltamarnix authored and wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    9526902 View commit details
    Browse the repository at this point in the history

  31. move more from shim to jinja

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    11338d2 View commit details
    Browse the repository at this point in the history

  32. codacy fixes

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    277c2d7 View commit details
    Browse the repository at this point in the history

  33. boltons and jinja as dev dependencies, cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    39867c5 View commit details
    Browse the repository at this point in the history

  34. gen -> codegen dep group

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    d41de76 View commit details
    Browse the repository at this point in the history

  35. mention deps in generate_classes docs

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    18dd3d6 View commit details
    Browse the repository at this point in the history

  36. handle missing jinja

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    6441ed6 View commit details
    Browse the repository at this point in the history

  37. fixes

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    05f24b9 View commit details
    Browse the repository at this point in the history

  38. fixes after review

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    10ea654 View commit details
    Browse the repository at this point in the history

  39. docstring indentation fix

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    94a535d View commit details
    Browse the repository at this point in the history

  40. formatting fixes

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    f9ddc23 View commit details
    Browse the repository at this point in the history

  41. fmt

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    7148e88 View commit details
    Browse the repository at this point in the history

  42. install dev dep group in mf6.yml

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    5f2e2d9 View commit details
    Browse the repository at this point in the history

  43. remove description from context, just use name.description

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e5b091b View commit details
    Browse the repository at this point in the history

  44. replace latex quotes in descriptions

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    4ef51f5 View commit details
    Browse the repository at this point in the history

  45. consolidate ref param replacement in shim, remove children, fix descr… 

    …iption
    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    fffed48 View commit details
    Browse the repository at this point in the history

  46. trim shim

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    8063906 View commit details
    Browse the repository at this point in the history

  47. add Dfn.load_all()

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    216e8fe View commit details
    Browse the repository at this point in the history

  48. dataclasses -> typeddicts

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b83644c View commit details
    Browse the repository at this point in the history

  49. remove unneeded imports

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    c668403 View commit details
    Browse the repository at this point in the history

  50. add params macro

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3b3f194 View commit details
    Browse the repository at this point in the history

  51. initial toml support

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e003eac View commit details
    Browse the repository at this point in the history

  52. Revert "add params macro" 

    This reverts commit 44f5db4.
    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    2fa53f8 View commit details
    Browse the repository at this point in the history

  53. fix renderable

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    41dd1a5 View commit details
    Browse the repository at this point in the history

  54. support var type directly (as str for now)

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    2b2f507 View commit details
    Browse the repository at this point in the history

  55. revisions

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    ee8ff8c View commit details
    Browse the repository at this point in the history

  56. ruff

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    0b7e3a0 View commit details
    Browse the repository at this point in the history

  57. remove shim and renderable, much cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3891f35 View commit details
    Browse the repository at this point in the history

  58. cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    d509e20 View commit details
    Browse the repository at this point in the history

  59. update dev guide

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    a128cbe View commit details
    Browse the repository at this point in the history

  60. file record squashing as a filter

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3d20c74 View commit details
    Browse the repository at this point in the history

  61. prep for version support

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    9c6c009 View commit details
    Browse the repository at this point in the history

  62. cleaner subpkg ref passing

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    dde9b6e View commit details
    Browse the repository at this point in the history

  63. add new deps to environment.yml

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3955ded View commit details
    Browse the repository at this point in the history

  64. fix filein/fileout in toml conversion

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    bdac389 View commit details
    Browse the repository at this point in the history

  65. switch dfn dataclass -> typeddict, owns-a (not is-a) var dict, cleare… 

    …r member naming
    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    623c8c3 View commit details
    Browse the repository at this point in the history

  66. order

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    57def41 View commit details
    Browse the repository at this point in the history

  67. improve docstrings, misc cleanup

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b2dbe5c View commit details
    Browse the repository at this point in the history

  68. improve dev guide

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    a47b772 View commit details
    Browse the repository at this point in the history

  69. revisions

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    53188ca View commit details
    Browse the repository at this point in the history

  70. whitespace mgmt

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    d9f596b View commit details
    Browse the repository at this point in the history

  71. better composite variable docstring format

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    96fc8c5 View commit details
    Browse the repository at this point in the history

  72. rebase and ruff

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3878326 View commit details
    Browse the repository at this point in the history

  73. indentation

    @wpbonelli
    wpbonelli committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    32ff250 View commit details
    Browse the repository at this point in the history