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

Author: spjuhel

CHANGELOG.md

@@ -17,6 +17,8 @@ Code freeze date: YYYY-MM-DD
 
 ### Fixed
 
+- Fixed asset count in impact logging message [#1195](https://github.com/CLIMADA-project/climada_python/pull/1195).
+
 ### Deprecated
 
 ### Removed

climada/engine/impact_calc.py

@@ -186,7 +186,7 @@ def impact(
             return self._return_empty(save_mat)
         LOGGER.info(
             "Calculating impact for %s assets (>0) and %s events.",
-            exp_gdf.size,
+            len(exp_gdf),
             self.n_events,
         )
         imp_mat_gen = self.imp_mat_gen(exp_gdf, impf_col)

climada/engine/test/test_impact_calc.py

@@ -441,7 +441,7 @@ def test_calc_insured_impact_no_insurance(self):
         self.assertEqual(
             logs.output,
             [
-                "INFO:climada.engine.impact_calc:Calculating impact for 150 assets (>0) and 14450 events."
+                "INFO:climada.engine.impact_calc:Calculating impact for 50 assets (>0) and 14450 events."
             ],
         )
         self.assertEqual(icalc.n_events, len(impact.at_event))

requirements/env_climada.yml

@@ -22,7 +22,7 @@ dependencies:
   - numexpr>=2.13
   - openpyxl>=3.1
   - osm-flex>=1.1  # this is only required for running the tutorials, not for the CLIMADA package itself
-  - pandas>=2.3
+  - pandas>=2.3,<3.0  # petals does not run with 3.0 (... and issue #1215)
   - pathos>=0.3
   - peewee>=3.18
   - pint>=0.24