hydromt fixes

Author: jzvolensky

docker/hydromt/Dockerfile

@@ -15,10 +15,6 @@ RUN apt-get update && apt-get install -y \
 
 COPY requirements.txt /hydromt/
 
-# # Install GDAL Python bindings matching system GDAL version
-# RUN pip install GDAL==$(gdal-config --version)
-# Install requirements (GDAL already removed from requirements.txt)
-
 RUN pip install -r /hydromt/requirements.txt
 #COPY all_basins.geojson /hydromt/
 # RUN git clone -b feature/stac_zarr_storage https://github.com/interTwin-eu/openeo-processes-dask.git
@@ -28,7 +24,6 @@ RUN pip install -r /hydromt/requirements.txt
 # RUN cd openeo-processes-dask && pip install .
 # RUN cd .
 # RUN pip uninstall -y pydantic && pip install pydantic==2.8.2 openeo_pg_parser_networkx==2024.10.0
-# clone commit https://gitlab.inf.unibz.it/earth_observation_public/raster-to-stac/-/commit/0df2519c93698314becedf230255b8ce6b5c29a9
 
 RUN git clone https://gitlab.inf.unibz.it/earth_observation_public/raster-to-stac.git
 RUN cd raster-to-stac && git checkout 0df2519c93698314becedf230255b8ce6b5c29a9 
@@ -41,17 +36,24 @@ RUN cd raster-to-stac && sed -i "s/SEMANTIC_VERSION/$R2S_VERSION/g" pyproject.to
 RUN pip install ./raster-to-stac
 
 # INSTALL openeo-processes-dask and submodule
-RUN git clone -b feature/load_stac_odc https://github.com/interTwin-eu/openeo-processes-dask.git
+# RUN git clone -b feature/load_stac_odc https://github.com/interTwin-eu/openeo-processes-dask.git
+# RUN cd openeo-processes-dask/openeo_processes_dask/specs && \ 
+#     git clone https://github.com/eodcgmbh/openeo-processes.git -b 2024.7.0
+# RUN cd .
+# RUN cd openeo-processes-dask && pip install . 
+# RUN cd .
+
+# INSTALL openeo-processes-dask and submodule
+RUN git clone https://github.com/interTwin-eu/openeo-processes-dask.git
 RUN cd openeo-processes-dask/openeo_processes_dask/specs && \ 
     git clone https://github.com/eodcgmbh/openeo-processes.git -b 2024.7.0
 RUN cd .
 RUN cd openeo-processes-dask && pip install . 
 RUN cd .
 
-# RUN pip install pystac==1.14.0
+# RUN pip uninstall -y pydantic && pip install pydantic==2.8.2 openeo_pg_parser_networkx==2024.10.0
 
-# overwrite the xarray installation with a later version
-RUN pip install xarray==2024.10.0
+RUN pip install pystac==1.14.0
 
 ##################### HydroMT Components setup #####################
 

docker/hydromt/requirements.txt

@@ -141,7 +141,7 @@ ujson==5.10.0
 universal_pathlib==0.2.6
 urllib3==2.4.0
 wrapt==1.17.2
-xarray==2024.3.0
+xarray==2024.10.0
 xmltodict==0.14.2
 xvec==0.2.0
 yarl==1.20.0

docker/hydromt/stac.py

@@ -186,8 +186,7 @@ def main(*args) -> None:
         requests.post(r2s.collection_url, json=stac_collection_to_post)
         stac_items = []
         with open(f"{output_dir}/inline_items.csv", "r") as f:
-            logger.info(f"Attempting to upload the items to STAC API: {
-                STAC_API_URL}{r2s.collection_id}/items")
+            logger.info(f"Attempting to upload the items to STAC API: {STAC_API_URL}{r2s.collection_id}/items")
             stac_items = f.readlines()
             for it in stac_items:
                 stac_data_to_post = json.loads(it)