diff --git a/docs/changelog.rst b/docs/changelog.rst index 996263b9..d4303835 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -6,8 +6,9 @@ All notable changes to this project will be documented in this page. The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. -Unreleased -========== +v0.5.0 (February 2024) +====================== +Better handling of nodata and a switch from ini to yaml for configuration. Added ----- @@ -28,9 +29,12 @@ Fixed Deprecated ---------- +- **read_staticmaps_pcr** in favour of same method in **pcrm** submodule +- **write_staticmaps_pcr** in favour of same method in **pcrm** submodule Documentation ------------- +- Extra information for most of the setup methods of **WflowModel** and **WWflowSedimentModel** v0.4.1 (November 2023) ====================== diff --git a/hydromt_wflow/__init__.py b/hydromt_wflow/__init__.py index dc84e8e0..f287a45a 100644 --- a/hydromt_wflow/__init__.py +++ b/hydromt_wflow/__init__.py @@ -2,7 +2,7 @@ from os.path import abspath, dirname, join -__version__ = "0.4.2.dev0" +__version__ = "0.5.0" try: import pcraster as pcr diff --git a/hydromt_wflow/wflow.py b/hydromt_wflow/wflow.py index 2447ff30..1c0430ea 100644 --- a/hydromt_wflow/wflow.py +++ b/hydromt_wflow/wflow.py @@ -28,8 +28,6 @@ from shapely.geometry import box from . import DATADIR, utils, workflows -from .pcrm import read_staticmaps_pcr as read_pcr_func -from .pcrm import write_staticmaps_pcr as write_pcr_func __all__ = ["WflowModel"] @@ -2757,36 +2755,6 @@ def write_staticmaps(self): ) self.write_grid() - def read_staticmaps_pcr(self, crs=4326, **kwargs): - """Read PCRaster maps in and add to grid.""" - self.logger.warning( - "read_staticmaps_pcr as a method of this object is deprecated. " - "Use 'read_staticmaps_pcr' from the 'pcrm' submodule instead. " - "Will be removed in hydromt_wflow v0.5.0" - ) - if self._read and "chunks" not in kwargs: - kwargs.update(chunks={"y": -1, "x": -1}) - read_pcr_func( - self.root, - crs=crs, - obj=self, - **kwargs, - ) - - def write_staticmaps_pcr(self): - """Write staticmaps at in PCRaster maps format.""" - self.logger.warning( - "write_staticmaps_pcr as a method of this object is deprecated. " - "Use 'write_staticmaps_pcr' for the 'pcrm' submodule instead. " - "Will be removed in hydromt_wflow v0.5.0" - ) - if not self._write: - raise IOError("Model opened in read-only mode") - write_pcr_func( - self.staticmaps, - self.root, - ) - def read_geoms( self, geom_fn: str = "staticgeoms", diff --git a/pyproject.toml b/pyproject.toml index 64199263..0066f713 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ authors = [ dependencies = [ "dask", "geopandas>=0.10", - "hydromt>=0.9.1", + "hydromt>=0.9.3,<0.10", "netcdf4", "numpy", "pandas", @@ -70,7 +70,7 @@ doc = [ examples = [ "jupyterlab", "cartopy", - "nbconvert==7.13.1", # Pin as of (02-2024); 7.14 onwards causes issues with the progressbar in example notebooks + "nbconvert==7.13.1", # Pin as of (02-2024); 7.14 onwards causes issues with the progressbar in example notebooks. See issue #233 for more info (https://github.com/Deltares/hydromt_wflow/issues/233). "notebook", ]