Merge branch 'develop' into feature/add-missing-JRC-flood-impact-func…

…tions
CLIMADA-project · Sep 27, 2024 · 49221b7 · 49221b7
2 parents a93c9fe + 83482af
commit 49221b7
Show file tree

Hide file tree

Showing 13 changed files with 3,293 additions and 2,908 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -25,3 +25,4 @@
 * Jan Wüthrich
 * Zélie Standhanske
 * Lukas Riedel
+* Samuel Juhel
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,14 @@ Code freeze date: YYYY-MM-DD
 
 ### Dependency Changes
 
+Added:
+
+- `boario` >=0.5.9
+
 ### Added
 
+- Included `boario` in the supplychain module [#81](https://github.com/CLIMADA-project/climada_petals/pull/81/)
+
 ### Changed
 
 ### Fixed
@@ -47,6 +53,8 @@ Added:
 - Update the table of content for the tutorials [#125](https://github.com/CLIMADA-project/climada_petals/pull/125)
 - Store all-zero fraction matrices in `LowFlow` and `WildFire` hazards [#129](https://github.com/CLIMADA-project/climada_petals/pull/129) [#131](https://github.com/CLIMADA-project/climada_petals/pull/131)
 
+- `eeioa` approach from the supply chain module. See [associated discussion](https://github.com/CLIMADA-project/climada_petals/pull/81#discussion_r1596546221).
+
 ## 4.1.0
 
 Release date: 2024-02-19
@@ -148,4 +156,3 @@ Release aligned with climada (core) 3.3.
 ### Fixed
 
 - fix issue [#69](https://github.com/CLIMADA-project/climada_petals/issues/70) Warn.zeropadding for islands [](https://github.com/CLIMADA-project/climada_petals/pull/70)
-