Merge remote-tracking branch 'origin/develop' into feature/risk_trajectory

Author: spjuhel

doc/development/Guide_Euler.ipynb

@@ -106,15 +106,23 @@
     "\n",
     "```bash\n",
     "pip install \\\n",
-    "  dask[dataframe] \\\n",
-    "  fiona==1.9 \\\n",
-    "  gdal==3.6 \\\n",
-    "  netcdf4==1.6.2 \\\n",
-    "  rasterio==1.4 \\\n",
-    "  pyproj==3.7 \\\n",
-    "  geopandas==1.0 \\\n",
-    "  xarray==2024.9 \\\n",
-    "  sparse==0.15\n",
+    "  --no-binary fiona \\\n",
+    "  --no-binary rasterio \\\n",
+    "  pyproj==3.7.1 \\\n",
+    "  fiona \\\n",
+    "  rasterio\n",
+    "\n",
+    "pip install \\\n",
+    "  'numpy<2' \\\n",
+    "  netcdf4 \\\n",
+    "  gdal==3.6.3 \\\n",
+    "  geopandas \\\n",
+    "  xarray \\\n",
+    "  cartopy \\\n",
+    "  sparse \\\n",
+    "  salib \\\n",
+    "  pyarrow \\\n",
+    "  xlrd\n",
     "```"
    ]
   },

requirements/env_climada.yml

@@ -35,7 +35,7 @@ dependencies:
   - rasterio>=1.4
   - requests>=2.32
   - rtree>=1.4
-  - salib>=1.5
+  - salib>=1.5,<1.5.2  # see https://github.com/CLIMADA-project/climada_python/issues/1081
   - scikit-learn>=1.7
   - scipy>=1.15
   - seaborn>=0.13

script/jenkins/test_notebooks.py

@@ -18,7 +18,7 @@
 
 
 # collect test cases, one for each notebook in the docs (unless they're excluded)
-NOTEBOOK_DIR = Path(__file__).parent.parent.parent.joinpath("doc", "tutorial")
+NOTEBOOK_DIR = Path(__file__).parent.parent.parent.joinpath("doc", "user-guide")
 NOTEBOOKS = [
     (f.absolute(), f.name)
     for f in sorted(NOTEBOOK_DIR.iterdir())