Skip to content

Cookiecutter update, GIS testing adjustments#589

Open
Zeitsperre wants to merge 15 commits intomainfrom
cookiecutter-update
Open

Cookiecutter update, GIS testing adjustments#589
Zeitsperre wants to merge 15 commits intomainfrom
cookiecutter-update

Conversation

@Zeitsperre
Copy link
Member

@Zeitsperre Zeitsperre commented Mar 12, 2026

Pull Request Checklist:

  • This PR addresses an already opened issue (for bug fixes / features)
    • This PR fixes #xyz
  • (If applicable) Documentation has been added / updated (for bug fixes / features).
  • (If applicable) Tests have been added.
  • CHANGELOG.rst has been updated (with summary of main changes).
    • Link to issue (:issue:number) and pull request (:pull:number) has been added.

What kind of change does this PR introduce?

  • Updates the cookiecutter to the latest version
    • Enables PEP 735 (dependency-groups)
    • Replaces pre-commit with prek
    • The Makefile now handles calls to install dependencies from tox
  • Tests have been adjusted to allow for testing without GIS libraries.

Does this PR introduce a breaking change?

Yes. The dev and docs install recipes are no longer available from the sdist and wheel distributions. These recipes are specifically for developers and are now only accessible when examining the source code. ravenpy[gis,raven-hydro] remain as valid install recipes.

Other information:

https://peps.python.org/pep-0735/
https://prek.j178.dev/

Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
@github-actions
Copy link
Contributor

Note

It appears that this Pull Request modifies the main.yml workflow.

On inspection, the RAVEN_TESTDATA_BRANCH environment variable is set to the most recent tag (v2025.6.12).

No further action is required.

Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Copy link
Collaborator

@huard huard left a comment

Choose a reason for hiding this comment

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

Thanks Trevor for the clean-up, much appreciated.

I'll just want to confirm with James that changes in outputs are expected from the Raven update.

Comment on lines +606 to 618
"0.227657", # NASH_SUTCLIFFE "0.253959", # FIXME: RHF v4.12 new value: "0.227657"
"-17.5132", # PCT_BIAS "-17.0904", # FIXME: RHF v4.12 new value: "-17.5132"
"0.405353", # KLING_GUPTA "0.443212", # FIXME: RHF v4.12 new value: 0.405353
]

# FIXME: RHF 4.12: Many of these values are no longer valid
for d, q_sim in [
(0, 85.92355875229545),
(1000, 74.05569855818379),
(2000, 62.675159400333115),
(3000, 42.73584909530037),
(4000, 128.70284018326998),
(1000, 70.7391269200262), # FIXME: Previously: 74.05569855818379
(2000, 65.24225415070816), # FIXME: Previously: 62.675159400333115
(3000, 45.2727362517773), # FIXME: Previously: 42.73584909530037
(4000, 127.63921091228055), # FIXME: Previously: 128.70284018326998
]:
Copy link
Collaborator

Choose a reason for hiding this comment

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

@analytophile Could you confirm that outputs from the routing emulator are expected to vary following the recent Raven update ?

Copy link
Member Author

Choose a reason for hiding this comment

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

@huard This test was not enabled for quite some time. It is very possible that the values here reflect changes from an earlier RHF (3.8, 4.1, etc.). Model expected outputs have shifted in other tests as well during that time.

Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants