Merge branch 'develop' into feature/remove_implicit_use_crs

Merge develop into branch

Author: luseverin

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       # Do not abort other tests if only a single one fails
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
 
     steps:
       -

.readthedocs.yml

@@ -11,7 +11,7 @@ build:
   # Append fixed Python version to requirements
   jobs:
     pre_create_environment:
-      - echo "  - python=3.9" >> requirements/env_climada.yml
+      - echo "  - python=3.11" >> requirements/env_climada.yml
 
 conda:
   environment: requirements/env_climada.yml

.zenodo.json

@@ -0,0 +1,120 @@
+{
+    "creators": [
+      {
+        "name": "Gabriela Aznar Siguan",
+        "affiliation": "MeteoSwiss"
+      },
+      {
+        "name": "David N. Bresch",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Samuel Eberenz",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Jan Hartman",
+        "affiliation": "CelsiusPro"
+      },
+      {
+        "name": "Marine Perus",
+        "affiliation": "CelsiusPro"
+      },
+      {
+        "name": "Thomas R\u00f6\u00f6sli"
+      },
+      {
+        "name": "Dario Stocker"
+      },
+      {
+        "name": "Veronica Bozzini"
+      },
+      {
+        "name": "Carmen B. Steinmann"
+      },
+      {
+        "name": "Evelyn M\u00fchlhofer",
+        "affiliation": "MeteoSwiss"
+      },
+      {
+        "name": "Rachel Bungerer"
+      },
+      {
+        "name": "Inga J. Sauer"
+      },
+      {
+        "name": "Samuel L\u00fcthi",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Pui Man (Mannie) Kam",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Simona Meiler",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Alessio Ciullo",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Thomas Vogt",
+        "affiliation": "Potsdam Institute for Climate Impact Research"
+      },
+      {
+        "name": "Benoit P. Guillod",
+        "affiliation": "CLIMADA Technologies"
+      },
+      {
+        "name": "Chahan M. Kropf",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Emanuel Schmid",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Chris Fairless",
+        "affiliation": "CelsiusPro"
+      },
+      {
+        "name": "Jan W\u00fcthrich"
+      },
+      {
+        "name": "Z\u00e9lie Stalhandske",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Yue Yu"
+      },
+      {
+        "name": "Lukas Riedel",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Raphael Portmann",
+        "affiliation": "Agroscope"
+      },
+      {
+        "name": "Nicolas Colombi",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Leonie Villiger"
+      },
+      {
+        "name": "Timo Schmid"
+      },
+      {
+        "name": "Luca Severino"
+      },
+      {
+        "name": "Samuel Juhel",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Valentin Gebhart"
+      }
+    ]
+  }

AUTHORS.md

@@ -23,7 +23,7 @@
 * Emanuel Schmid
 * Chris Fairless
 * Jan Wüthrich
-* Zélie Standhanske
+* Zélie Stalhandske
 * Yue Yu
 * Lukas Riedel
 * Raphael Portmann

CHANGELOG.md

@@ -12,6 +12,57 @@ Code freeze date: YYYY-MM-DD
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Deprecated
+
+### Removed
+
+## 6.0.0
+
+Release date: 2025-03-03
+
+### Dependency Changes
+
+Added:
+
+- `osm-flex` >=1.1
+
+Updated:
+
+- `cartopy` >=0.23 → >=0.24
+- `cfgrib` >=0.9.9,<0.9.10 &rarr; >=0.9
+- `dask` >=2024.2,<2024.3 &rarr; >=2025.2
+- `eccodes` >=2.27,<2.28 &rarr; >=2.40
+- `gdal` >=3.6 &rarr; >=3.10
+- `geopandas` >=0.14 &rarr; >=0.14,<1.0
+- `h5py` >=3.8 &rarr; >=3.12
+- `haversine` >=2.8 &rarr; >=2.9
+- `matplotlib-base` >=3.9 &rarr; >=3.10
+- `netcdf4` >=1.6 &rarr; >=1.7
+- `numba` >=0.60 &rarr; >=0.61
+- `pillow` =9.4 &rarr; =11.1
+- `pyproj` >=3.5 &rarr; >=3.7
+- `pytables` >=3.7 &rarr; >=3.10
+- `python` =3.9 &rarr; =3.11
+- `rasterio` >=1.3 &rarr; >=1.4
+- `scikit-learn` >=1.5 &rarr; >=1.6
+- `scipy` >=1.13 &rarr; >=1.14,<1.15
+- `tqdm` >=4.66 &rarr; >=4.67
+- `xarray` >=2024.6 &rarr; >=2025.1
+- `xlsxwriter` >=3.1 &rarr; >=3.2
+
+Removed:
+
+- `pyepsg`
+
+### Added
+
+- `climada.hazard.tc_tracks.TCTracks.from_FAST` function, add Australia basin (AU) [#993](https://github.com/CLIMADA-project/climada_python/pull/993)
+- Add `osm-flex` package to CLIMADA core [#981](https://github.com/CLIMADA-project/climada_python/pull/981)
+- `doc.tutorial.climada_entity_Exposures_osm.ipynb` tutorial explaining how to use `osm-flex`with CLIMADA
 - `climada.util.coordinates.bounding_box_global` function [#980](https://github.com/CLIMADA-project/climada_python/pull/980)
 - `climada.util.coordinates.bounding_box_from_countries` function [#980](https://github.com/CLIMADA-project/climada_python/pull/980)
 - `climada.util.coordinates.bounding_box_from_cardinal_bounds` function [#980](https://github.com/CLIMADA-project/climada_python/pull/980)
@@ -37,14 +88,16 @@ Code freeze date: YYYY-MM-DD
 - In `climada.util.plot.geo_im_from_array`, NaNs are plotted in gray while cells with no centroid are not plotted [#929](https://github.com/CLIMADA-project/climada_python/pull/929)
 - Renamed `climada.util.plot.subplots_from_gdf` to `climada.util.plot.plot_from_gdf` [#929](https://github.com/CLIMADA-project/climada_python/pull/929)
 - `Hazard.local_exceedance_inten`, `Hazard.local_return_period`, and `Impact.local_exceedance_imp` call the corresponding new functions and a deprecation warning is added [#918](https://github.com/CLIMADA-project/climada_python/pull/918). Some inconsistencies in the previous versions are removed and the default method is changed. To reconstruct results from the previous versions, use CLIMADA v5.0.0 or less.
+- elements of `event_name` are now explicitly converted to `str` in `from_raster`, `from_xarray_raster`, `from_excel` and `from_csv`. [#951](https://github.com/CLIMADA-project/climada_python/pull/951), [#910](https://github.com/CLIMADA-project/climada_python/issues/910)
+- `event_id` and `event_name` are now explicitly converted to respectively a `np.ndarray` (`event_id`), a `list` (`event_name`) in readers. [#951](https://github.com/CLIMADA-project/climada_python/pull/951), [#950](https://github.com/CLIMADA-project/climada_python/issues/950)
 - Exposures complete overhaul. Notably
-  - the _geometry_ column of the inherent `GeoDataFrame` is set up at initialization
-  - latitude and longitude column are no longer present there (the according arrays can be retrieved as properties of the Exposures object: `exp.latitude` instead of `exp.gdf.latitude.values`).
-  - `Exposures.gdf` has been renamed to `Exposures.data` (it still works though, as it is a property now pointing to the latter)
-  - the `check` method does not add a default "IMPF_" column to the GeoDataFrame anymore
+- the _geometry_ column of the inherent `GeoDataFrame` is set up at initialization
+- latitude and longitude column are no longer present there (the according arrays can be retrieved as properties of the Exposures object: `exp.latitude` instead of `exp.gdf.latitude.values`).
+- `Exposures.gdf` has been renamed to `Exposures.data` (it still works though, as it is a property now pointing to the latter)
+- the `check` method does not add a default "IMPF_" column to the GeoDataFrame anymore
 - Updated IBTrACS version from v4.0 to v4.1 ([#976](https://github.com/CLIMADA-project/climada_python/pull/976)
-    - Fix xarray future warning in TCTracks for .dims to .sizes
-    - Fix hazard.concatenate type test for pathos pools
+- Fix xarray future warning in TCTracks for .dims to .sizes
+- Fix hazard.concatenate type test for pathos pools
 
 ### Fixed
 
@@ -54,6 +107,7 @@ Code freeze date: YYYY-MM-DD
 
 ### Deprecated
 
+- `climada.hazard.trop_cyclone.trop_cyclone_windfields.compute_angular_windspeeds.cyclostrophic` argument
 - `climada.entity.exposures.Exposures.meta` attribute
 - `climada.entity.exposures.Exposures.set_lat_lon` method
 - `climada.entity.exposures.Exposures.set_geometry_points` method
@@ -62,8 +116,6 @@ Code freeze date: YYYY-MM-DD
 - `climada.engine.impact.Impact.local_exceedance_imp` method
 - `climada.engine.impact.Impact.plot_rp_imp` method
 
-### Removed
-
 ## 5.0.0
 
 Release date: 2024-07-19

README.md

@@ -4,7 +4,9 @@
 
 # CLIMADA
 
-CLIMADA stands for **CLIM**ate **ADA**ptation and is a probabilistic natural catastrophe impact model, that also calculates averted damage (benefit) thanks to adaptation measures of any kind (from grey to green infrastructure, behavioural, etc.).
+[CLIMADA](https://climada.ethz.ch/climada/) (CLIMate ADAptation) is a free and open-source software framework for climate risk assessment and adaptation
+option appraisal. Designed by a large scientific community, it helps reasearchers, policymakers, and businesses analyse the impacts of natural hazards and
+explore adaptation strategies.
 
 As of today, CLIMADA provides global coverage of major climate-related extreme-weather hazards at high resolution (4x4km) via a [data API](https://climada.ethz.ch/data-api/v1/docs) For select hazards, historic and probabilistic events sets, for past, present and future climate exist at distinct time horizons.
 You will find a repository containing scientific peer-reviewed articles that explain software components implemented in CLIMADA [here](https://github.com/CLIMADA-project/climada_papers).
@@ -37,18 +39,17 @@ Follow the [tutorials](https://climada-python.readthedocs.io/en/stable/tutorial/
 
 The online documentation is available on [Read the Docs](https://climada-python.readthedocs.io/en/stable/).The documentation of each release version of CLIMADA can be accessed separately through the drop-down menu at the bottom of the left sidebar. Additionally, the version 'stable' refers to the most recent release (installed via `conda`), and 'latest' refers to the latest unstable development version (the `develop` branch).
 
-
 CLIMADA python:
 
-* [online (recommended)](https://climada-python.readthedocs.io/en/latest/)
-* [PDF file](https://climada-python.readthedocs.io/_/downloads/en/stable/pdf/)
-* [core Tutorials on GitHub](https://github.com/CLIMADA-project/climada_python/tree/main/doc/tutorial)
+- [online (recommended)](https://climada-python.readthedocs.io/en/latest/)
+- [PDF file](https://climada-python.readthedocs.io/_/downloads/en/stable/pdf/)
+- [core Tutorials on GitHub](https://github.com/CLIMADA-project/climada_python/tree/main/doc/tutorial)
 
 CLIMADA petals:
 
-* [online (recommended)](https://climada-petals.readthedocs.io/en/latest/)
-* [PDF file](https://climada-petals.readthedocs.io/_/downloads/en/stable/pdf/)
-* [petals Tutorials on GitHub](https://github.com/CLIMADA-project/climada_petals/tree/main/doc/tutorial)
+- [online (recommended)](https://climada-petals.readthedocs.io/en/latest/)
+- [PDF file](https://climada-petals.readthedocs.io/_/downloads/en/stable/pdf/)
+- [petals Tutorials on GitHub](https://github.com/CLIMADA-project/climada_petals/tree/main/doc/tutorial)
 
 The documentation can also be [built locally](https://climada-python.readthedocs.io/en/latest/README.html).
 
@@ -74,6 +75,6 @@ We use [SemVer](http://semver.org/) for versioning. For the versions available,
 
 Copyright (C) 2017 ETH Zurich, CLIMADA contributors listed in AUTHORS.
 
-CLIMADA is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License Version 3, 29 June 2007 as published by the Free Software Foundation, https://www.gnu.org/licenses/gpl-3.0.html
+CLIMADA is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License Version 3, 29 June 2007 as published by the Free Software Foundation, <https://www.gnu.org/licenses/gpl-3.0.html>
 
-CLIMADA is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html
+CLIMADA is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: <https://www.gnu.org/licenses/gpl-3.0.html>

climada/_version.py

@@ -1 +1 @@
-__version__ = "5.0.1-dev"
+__version__ = "6.0.1-dev"