From d949151be1490421596bcd103ce48496a87ccc19 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Wed, 11 Mar 2026 14:30:44 -0400 Subject: [PATCH 1/3] update raven-hydro to v4.12.1 Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- CHANGELOG.rst | 1 + environment-dev.yml | 2 +- environment-docs.yml | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e1464bdb..a07dc01d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,7 @@ Contributors: Trevor James Smith (:user:`Zeitsperre`). Changes ^^^^^^^ +* `raven-hydro` minimum version updated from v0.5.0 to v4.12.1 (for more information, see: https://github.com/Ouranosinc/raven-hydro/pull/93). * Dependency updates. (PR #584): * Updated required `xskillscore` (``>= 0.0.29``) and `climpred` (``>= 2.6.0``). * Removed version pins on `intake` and `intake-xarray`. diff --git a/environment-dev.yml b/environment-dev.yml index 270af7b5..0de5f15f 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - python >=3.10,<3.15 - - raven-hydro >=0.5.0,<1.0 + - raven-hydro >=4.12.1,<5.0 # - libgcc # for mixing raven-hydro from PyPI with conda environments - cftime >=1.4.1 - cf_xarray >=0.9.3 diff --git a/environment-docs.yml b/environment-docs.yml index 108d1749..d25d9e83 100644 --- a/environment-docs.yml +++ b/environment-docs.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - python >=3.13,<3.14 - - raven-hydro >=0.5.0,<1.0 + - raven-hydro >=4.12.1,<5.0 - cftime >=1.4.1 - cf-xarray >=0.9.3 - click >=8.2.0 diff --git a/pyproject.toml b/pyproject.toml index b057b04c..7763b4de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -141,7 +141,7 @@ gis = [ "shapely >=2.0" ] raven-hydro = [ - "raven-hydro >=0.5.0,<1.0" + "raven-hydro >=4.12.1,<5.0" ] all = [ "ravenpy[dev]", From d2f1bcd96340718fa9830dae94af8f16860ffcfc Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Wed, 11 Mar 2026 14:31:02 -0400 Subject: [PATCH 2/3] typing fixes Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- src/ravenpy/config/rvs.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ravenpy/config/rvs.py b/src/ravenpy/config/rvs.py index 6a1a3f05..6f1befe6 100644 --- a/src/ravenpy/config/rvs.py +++ b/src/ravenpy/config/rvs.py @@ -4,7 +4,7 @@ from dataclasses import asdict, fields, is_dataclass from pathlib import Path from textwrap import dedent -from typing import Any, Optional, Union +from typing import Any, Optional, Union, cast import cftime from pydantic import ConfigDict, Field, ValidationInfo, field_validator @@ -448,6 +448,8 @@ def is_symbolic(params: Union[dict, Any]) -> bool: from pymbolic.primitives import Variable if is_dataclass(params) and not isinstance(params, type): - params = {field.name: getattr(params, field.name) for field in fields(params)} + param_dict: dict = {field.name: getattr(params, field.name) for field in fields(params)} + else: + param_dict = cast(dict, params) - return any([isinstance(v, Variable) for v in params.values()]) + return any([isinstance(v, Variable) for v in param_dict.values()]) From ab9de239e79aea8fc0cbf86a618eaea448c7f6b6 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Thu, 12 Mar 2026 09:50:21 -0400 Subject: [PATCH 3/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 a07dc01d..e678f8d3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,7 @@ Contributors: Trevor James Smith (:user:`Zeitsperre`). Changes ^^^^^^^ -* `raven-hydro` minimum version updated from v0.5.0 to v4.12.1 (for more information, see: https://github.com/Ouranosinc/raven-hydro/pull/93). +* `raven-hydro` minimum version updated from v0.5.0 to v4.12.1 (for more information, see: https://github.com/Ouranosinc/raven-hydro/pull/93). (PR #587) * Dependency updates. (PR #584): * Updated required `xskillscore` (``>= 0.0.29``) and `climpred` (``>= 2.6.0``). * Removed version pins on `intake` and `intake-xarray`.