From 3c561e3629d03bbbd17aa1ccb1abfa48748d7e45 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 22 Dec 2025 11:40:33 -0500 Subject: [PATCH 1/3] update raven-hydro to v5.0 (RavenHydroFramework v4.1.0) Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- CHANGELOG.rst | 4 ++++ environment-dev.yml | 2 +- environment-docs.yml | 2 +- pyproject.toml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 93f8a48b..c9e41b3e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,10 @@ Changelog Contributors: David Huard (:user:`huard`), Trevor James Smith (:user:`Zeitsperre`). +New features +^^^^^^^^^^^^ +* Updated `raven-hydro` to v0.5.0 (`RavenHydroFramework` v4.1.0). + Fixes ^^^^^ * Fix `Reservoir` command parser failing when optional fields were missing. (PR #544) diff --git a/environment-dev.yml b/environment-dev.yml index 650f15e8..ecc18427 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - python >=3.10,<3.14 - - raven-hydro >=0.4.0,<1.0 + - raven-hydro >=0.5.0,<1.0 # - libgcc # for mixing raven-hydro from PyPI with conda environments - affine >=2.4.0 - cftime >=1.4.1 diff --git a/environment-docs.yml b/environment-docs.yml index 2b361388..aec1059b 100644 --- a/environment-docs.yml +++ b/environment-docs.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - python >=3.12,<3.13 - - raven-hydro >=0.4.0,<1.0 + - raven-hydro >=0.5.0,<1.0 - autodoc-pydantic >=2.1.0 - birdy - cairosvg >=2.6.0 diff --git a/pyproject.toml b/pyproject.toml index ff060b36..9268d9bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -140,7 +140,7 @@ gis = [ "shapely >=2.0" ] raven-hydro = [ - "raven-hydro >=0.4.0,<1.0" + "raven-hydro >=0.5.0,<1.0" ] all = [ "ravenpy[dev]", From ead00e7c27959994f10a26f5e5dbe0f4508e6f62 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 22 Dec 2025 12:18:26 -0500 Subject: [PATCH 2/3] update CHANGELOG.rst Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c9e41b3e..8507ec54 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,7 @@ Contributors: David Huard (:user:`huard`), Trevor James Smith (:user:`Zeitsperre New features ^^^^^^^^^^^^ -* Updated `raven-hydro` to v0.5.0 (`RavenHydroFramework` v4.1.0). +* Updated `raven-hydro` to v0.5.0 (`RavenHydroFramework` v4.1.0). (PR #560) Fixes ^^^^^ From 77b595f690525e4bf3d49ae6f22881cea11704ca Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 22 Dec 2025 14:06:12 -0500 Subject: [PATCH 3/3] update SACSMA expected test values Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- tests/test_emulators.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_emulators.py b/tests/test_emulators.py index ed8cefca..b2aa7f6a 100644 --- a/tests/test_emulators.py +++ b/tests/test_emulators.py @@ -20,7 +20,8 @@ # "CanadianShield": 0.3968, <- This is the value for CanadianShield with RavenHydroFramework v3.7 "CanadianShield": 0.4001, # <- This is the new value for CanadianShield with RavenHydroFramework v3.8 and v3.8.1 "HYPR": 0.685188, - "SACSMA": -0.0382907, + # "SACSMA": -0.0383, # <- This is the original value for SACSMA with RavenHydroFramework v3.8.1 and v4.0.0 + "SACSMA": -0.2666, # "Blended": -0.913785, <- This is the original value for Blended with RavenHydroFramework v3.8.1 "Blended": -1.1507, # <- This is the new value for Blended with RavenHydroFramework v4.0.1 } @@ -42,7 +43,7 @@ def test_run(numeric_config, tmp_path): out = e.run() d = out.diagnostics - np.testing.assert_almost_equal(d["DIAG_NASH_SUTCLIFFE"], NSE[name], 4) + np.testing.assert_almost_equal(d["DIAG_NASH_SUTCLIFFE"], [NSE[name]], 4) if name == "CanadianShield": pytest.skip("Missing solution due to SuppressOutput.")