lowered minimal pandas version restriction and defined _TIMESTR only …

…once

envs/hydromt-delft3dfm-min.yml

@@ -10,7 +10,7 @@ dependencies:
   - geopandas<1
   - hydromt==0.10.0
   - numpy<2
-  - pandas
+  - pandas>=2.0.0
   - pip
   - pyflwdir >=0.5.4
   - pyproj

envs/hydromt-delft3dfm.yml

@@ -15,7 +15,7 @@ dependencies:
   - hydromt>=0.10.0,<0.15 # To avoid getting v1 alpha
   - nbsphinx # docs notebook examples
   - numpy<2
-  - pandas>=2.2.0
+  - pandas>=2.0.0
   - pip
   - pre-commit # linting
   - pydata-sphinx-theme # docs

hydromt_delft3dfm/workflows/boundaries.py

@@ -13,6 +13,9 @@
 
 logger = logging.getLogger(__name__)
 
+_TIMESTR = {"D": "days", "h": "hours", "min": "minutes", "s": "seconds",
+            "H": "hours", "S": "seconds", # support for pandas<2.2.0
+            }
 
 __all__ = [
     "get_boundaries_with_nodeid",
@@ -319,7 +322,6 @@ def compute_2dboundary_values(
     else:
         # prepare boundary data
         # get data freq in seconds
-        _TIMESTR = {"D": "days", "h": "hours", "min": "minutes", "s": "seconds"}
         dt = df_bnd.time[1] - df_bnd.time[0]
         freq = dt.resolution_string
         multiplier = 1
@@ -508,7 +510,6 @@ def compute_meteo_forcings(
 
     logger.info("Preparing global (spatially uniform) timeseries.")
     # get data freq in seconds
-    _TIMESTR = {"D": "days", "h": "hours", "min": "minutes", "s": "seconds"}
     dt = df_meteo.time[1] - df_meteo.time[0]
     freq = dt.resolution_string
     multiplier = 1
@@ -559,7 +560,6 @@ def compute_meteo_forcings(
 
 def _standardize_forcing_timeindexes(da):
     """Standardize timeindexes frequency based on forcing DataArray."""
-    _TIMESTR = {"D": "days", "h": "hours", "min": "minutes", "s": "seconds"}
     dt = pd.to_timedelta((da.time[1].values - da.time[0].values))
     freq = dt.resolution_string
     multiplier = 1

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
 	"hydromt>=0.10.0, <0.15",
 	"geopandas>=0.10, <1", # TODO: remove upper bound: https://github.com/Deltares/hydromt_delft3dfm/issues/135
 	"numpy<2",
-	"pandas>=2.2.0",
+	"pandas>=2.0.0",
 	"xarray",
 	"hydrolib-core>=0.6.1, <0.8",
 	"xugrid>=0.9.0",