diff --git a/.cruft.json b/.cruft.json index 11c95c88..4923259c 100644 --- a/.cruft.json +++ b/.cruft.json @@ -10,7 +10,7 @@ "project_slug": "ravenpy", "project_short_description": "A Python wrapper to setup and run the hydrologic modelling framework Raven.", "pypi_username": "CSHS-CWRA", - "version": "0.15.1-dev.2", + "version": "0.15.1-dev.3", "use_pytest": "y", "use_black": "y", "use_conda": "y", diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 534ec201..096136c5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,7 +19,7 @@ Internal changes * Many `numpydoc`-style docstrings have been adjusted for consistency. * Added `setuptools` to the `gis` build recipe to ensure that the `gdal` bindings are built successfully. (PR #400) * Modified the sub-basin and channel profile extraction functions to correctly set the river length to zero and set default values for reach attributes in sub-basins with no channel routing (i.e., sub-basins with lakes or headwater basins). (issue #354, PR #401) -* Improved the HBV-EC emulator by adding parameter information (name, definition, and Raven default values) and fixed the variable name for the adiabatic temperature lapse rate. (PR #404) +* Improved the HBV-EC emulator by adding parameter information (name, definition, and Raven default values), fixed the variable name for the adiabatic temperature lapse rate, and added an alias for rain snow fraction to match other emulators. (PR #404 and #408) * Modified the `sphinx` configuration to better support SVG and to remove incompatible elements from the PDF build. (PR #407) v0.15.0 (2024-06-20) diff --git a/pyproject.toml b/pyproject.toml index fd0131da..209dea4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -168,7 +168,7 @@ target-version = [ ] [tool.bumpversion] -current_version = "0.15.1-dev.2" +current_version = "0.15.1-dev.3" commit = true commit_args = "--no-verify" tag = false diff --git a/src/ravenpy/__init__.py b/src/ravenpy/__init__.py index 54797a38..e5dc5fe6 100644 --- a/src/ravenpy/__init__.py +++ b/src/ravenpy/__init__.py @@ -30,4 +30,4 @@ __author__ = """David Huard""" __email__ = "huard.david@ouranos.ca" -__version__ = "0.15.1-dev.2" +__version__ = "0.15.1-dev.3" diff --git a/src/ravenpy/config/emulators/hbvec.py b/src/ravenpy/config/emulators/hbvec.py index d1b4d98f..c21038bd 100644 --- a/src/ravenpy/config/emulators/hbvec.py +++ b/src/ravenpy/config/emulators/hbvec.py @@ -140,7 +140,9 @@ class HBVEC(Config): lw_radiation_method: o.LWRadiationMethod = Field( "LW_RAD_DEFAULT", alias="LWRadiationMethod" ) - rain_snow_fraction: o.RainSnowFraction = Field("RAINSNOW_HBV") + rain_snow_fraction: o.RainSnowFraction = Field( + "RAINSNOW_HBV", alias="RainSnowFraction" + ) potential_melt_method: o.PotentialMeltMethod = Field( "POTMELT_HBV", alias="PotentialMeltMethod" ) diff --git a/tests/test_ravenpy.py b/tests/test_ravenpy.py index ed92b333..2aa2a880 100644 --- a/tests/test_ravenpy.py +++ b/tests/test_ravenpy.py @@ -43,4 +43,4 @@ def test_package_metadata(): contents = f.read() assert """David Huard""" in contents assert '__email__ = "huard.david@ouranos.ca"' in contents - assert '__version__ = "0.15.1-dev.2"' in contents + assert '__version__ = "0.15.1-dev.3"' in contents