Merge branch 'develop' into bugfix/pr_request

Author: ChrisFairless

requirements/env_climada.yml

@@ -20,7 +20,7 @@ dependencies:
   - netcdf4>=1.7
   - numba>=0.61
   - numexpr>=2.10
-  - openpyxl>=3.1
+  - openpyxl>=3.0
   - osm-flex>=1.1  # this is only required for running the tutorials, not for the CLIMADA package itself
   - pandas>=2.1
   - pathos>=0.3
@@ -31,14 +31,13 @@ dependencies:
   - pycountry>=24.6
   - pyproj>=3.7
   - pytables>=3.10  # this is the name of the pypi 'tables' package on conda-forge
-  - python>=3.10,<3.13
   - pyxlsb>=1.0
   - rasterio>=1.4
   - requests>=2.32
-  - rtree>=1.3,<1.4  # 1.4.0 doesn't pass the `pip check`, needed by geopandas
+  - rtree>=1.3
   - salib>=1.5
   - scikit-learn>=1.7
-  - scipy>=1.14,<1.15  # 1.15 is not compatible with climada_petals, climada_petals.engine.test.test_supplychain fails with "'Series' has no attribute 'nonzero'"
+  - scipy>=1.14
   - seaborn>=0.13
   - sparse>=0.17
   - statsmodels>=0.14

script/jenkins/install_env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
-mamba remove --name climada_env --all
-mamba create -n climada_env python=3.11
+mamba env remove -n climada_env -y
+mamba create -n climada_env python=3.11 -y
 mamba env update -n climada_env -f requirements/env_climada.yml
 
 source activate climada_env