Unpin numpy

.github/workflows/docs.yml

@@ -39,9 +39,10 @@ jobs:
             miniforge-version: latest
             use-mamba: true
 
+      ## mamba required to install pandoc with nbsphinx (does not work via pip)
       - name: Setup env
         run: |
-          python make_env.py full -p 3.11 -n hydromt-sfincs -o environment-doc.yml
+          python make_env.py doc,examples -p 3.11 -n hydromt-sfincs -o environment-doc.yml
           mamba env create -f environment-doc.yml
           mamba run -n hydromt-sfincs pip install -e .
 

.github/workflows/tests_dev.yml

@@ -1,63 +1,62 @@
-# Uncomment when we move to HydroMT v1
-# name: Tests with HydroMT dev
+name: Tests with HydroMT dev
 
-# on:
-#   # trigger weekly on monday at 00:00 UTC
-#   schedule:
-#     - cron: '0 0 * * 1'
-#   push:
-#     branches: [main]
-#     paths:
-#       - .github/workflows/tests_dev.yml
-#       - tests/*
-#       - hydromt_sfincs/*
-#       - pyproject.toml
-#   pull_request:
-#     branches: [main]
-#     paths:
-#       - .github/workflows/tests_dev.yml
-#       - tests/*
-#       - hydromt_sfincs/*
-#       - pyproject.toml
+on:
+  # trigger weekly on monday at 00:00 UTC
+  schedule:
+    - cron: '0 0 * * 1'
+  push:
+    branches: [main]
+    paths:
+      - .github/workflows/tests_dev.yml
+      - tests/*
+      - hydromt_sfincs/*
+      - pyproject.toml
+  pull_request:
+    branches: [main]
+    paths:
+      - .github/workflows/tests_dev.yml
+      - tests/*
+      - hydromt_sfincs/*
+      - pyproject.toml
 
-# jobs:
-#   build:
-#     defaults:
-#       run:
-#         shell: bash -l {0}
-#     strategy:
-#       fail-fast: false
-#     runs-on: ubuntu-latest
-#     timeout-minutes: 30
-#     concurrency:
-#       group: ${{ github.workflow }}-${{ matrix.python-version }}-${{ github.ref }}
-#       cancel-in-progress: true
-#     steps:
+jobs:
+  build:
+    defaults:
+      run:
+        shell: bash -l {0}
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.python-version }}-${{ github.ref }}
+      cancel-in-progress: true
+    steps:
 
-#       - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-#       - uses: actions/setup-python@v5
-#         id: pip
-#         with:
-#           # caching, see https://github.com/actions/setup-python/blob/main/docs/advanced-usage.md#caching-packages
-#           cache: 'pip'
-#           python-version: '3.9'  # 3.9 is not supported by last released version of hydromt
-#           cache-dependency-path: pyproject.toml
+      - uses: actions/setup-python@v5
+        id: pip
+        with:
+          # caching, see https://github.com/actions/setup-python/blob/main/docs/advanced-usage.md#caching-packages
+          cache: 'pip'
+          python-version: '3.11'
+          cache-dependency-path: pyproject.toml
 
-#       # true if cache-hit occurred on the primary key
-#       - name: Cache hit
-#         run: echo '${{ steps.pip.outputs.cache-hit }}'
+      # true if cache-hit occurred on the primary key
+      - name: Cache hit
+        run: echo '${{ steps.pip.outputs.cache-hit }}'
 
-#       # build environment with pip
-#       - name: Install hydromt-sfincs
-#         run: |
-#           pip install --upgrade pip
-#           pip install .[test,examples]
-#           pip install git+https://github.com/Deltares/hydromt.git
-#           pip list
+      # build environment with pip
+      - name: Install hydromt-sfincs
+        run: |
+          pip install --upgrade pip
+          pip install .[test,examples]
+          pip install git+https://github.com/Deltares/hydromt.git@v0.10.1
+          pip list
 
-#       # run test
-#       - name: Test
-#         run: |
-#           export NUMBA_DISABLE_JIT=1
-#           python -m pytest --verbose
+      # run test
+      - name: Test
+        run: |
+          export NUMBA_DISABLE_JIT=1
+          python -m pytest --verbose

hydromt_sfincs/regulargrid.py

@@ -228,7 +228,7 @@ def create_mask_active(
             _msk1 = np.logical_xor(
                 da_mask, ndimage.binary_fill_holes(da_mask, structure=s)
             )
-            regions = ndimage.measurements.label(_msk1, structure=s)[0]
+            regions = ndimage.label(_msk1, structure=s)[0]
             # TODO check if region_area works for rotated grids!
             lbls, areas = region_area(regions, self.transform, latlon)
             n = int(sum(areas / 1e6 < fill_area))
@@ -237,7 +237,7 @@ def create_mask_active(
                 da_mask, np.isin(regions, lbls[areas / 1e6 < fill_area])
             )
         if drop_area > 0:
-            regions = ndimage.measurements.label(da_mask.values, structure=s)[0]
+            regions = ndimage.label(da_mask.values, structure=s)[0]
             lbls, areas = region_area(regions, self.transform, latlon)
             _msk = np.isin(regions, lbls[areas / 1e6 >= drop_area])
             n = int(sum(areas / 1e6 < drop_area))

hydromt_sfincs/sfincs.py

@@ -2876,11 +2876,12 @@ def write(self):
         self.write_states()
         # config last; might be udpated when writing maps, states or forcing
         self.write_config()
-        # write data catalog with used data sources
-        try:
-            self.write_data_catalog()  # new in hydromt v0.4.4
-        except Exception as e:
-            self.logger.error(f"Error writing data catalog: {str(e)}")
+        # FIXME - erroneous data catalog writing should be avoided to prevent errors later on
+        # # write data catalog with used data sources
+        # try:
+        #     self.write_data_catalog()  # new in hydromt v0.4.4
+        # except Exception as e:
+        #     self.logger.error(f"Error writing data catalog: {str(e)}")
 
     def read_grid(self, data_vars: Union[List, str] = None) -> None:
         """Read SFINCS binary grid files and save to `grid` attribute.

hydromt_sfincs/workflows/curvenumber.py

@@ -43,7 +43,7 @@ def scs_recovery_determination(
     ).load()
 
     # Curve numbers to grid: go over NLCD classes and HSG classes
-    da_CN = xr.full_like(da_landuse, np.NaN, dtype=np.float32)
+    da_CN = xr.full_like(da_landuse, np.nan, dtype=np.float32)
     for i in range(df_map.index.size):
         for j in range(df_map.columns.size):
             ind = (da_landuse == df_map.index[i]) & (

make_env.py

@@ -43,7 +43,7 @@ def _parse_profile(profile_str: str, opt_deps: dict, project_name: str) -> List[
 
 parser = argparse.ArgumentParser()
 
-parser.add_argument("profile", default="dev,test", nargs="?")
+parser.add_argument("profile", default="test,examples,doc", nargs="?")
 parser.add_argument("--output", "-o", default="environment.yml")
 parser.add_argument("--channels", "-c", default=None)
 parser.add_argument("--name", "-n", default=None)
@@ -86,7 +86,7 @@ def _parse_profile(profile_str: str, opt_deps: dict, project_name: str) -> List[
 conda_deps = []
 pip_deps = []
 for dep in deps_to_install:
-    if dep in deps_not_in_conda:
+    if any([dep.startswith(pypi_dep) for pypi_dep in deps_not_in_conda]):
         pip_deps.append(dep)
     else:
         conda_deps.append(dep)

pyproject.toml

@@ -13,12 +13,12 @@ authors = [
 dependencies = [
     "affine",
     "geopandas>1.0",
-    "hydromt>=0.10, <0.11",
+    "hydromt>=0.10.1,<1.0",
     "numba",
-    "numpy<2.0", # temp pin until bottleneck release v1.4
+    "numpy",
     "pandas",
     "pillow",
-    "pyflwdir>=0.5.5, <0.5.9",
+    "pyflwdir>=0.5.10",
     "pyproj",
     "rasterio",
     "scipy",
@@ -86,6 +86,8 @@ channels = ["conda-forge"]
 deps_not_in_conda = [
   "sphinx_design",
   "black[jupyter]",
+  "hydromt",  # temporary until hydromt v0.10.1 is released
+  "pyflwdir", # temporary until pyflwdir v0.5.10 is released on conda-forge
 ]
 
 [tool.pytest.ini_options]