Skip to content

Commit 89a8b24

Browse files
committed
Merge develop, squashed commit of the following:
commit f312a58 Merge: 2995735 2ed84e5 Author: Samuel Juhel <[email protected]> Date: Wed Jun 4 15:36:52 2025 +0200 Merge pull request #977 from CLIMADA-project/feature/documentation-restructuring Restructuring of the documentation commit 2ed84e5 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:37:15 2025 +0200 doc(rst,changelog): fixes trailing, updates changelog commit 8797d60 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:32:03 2025 +0200 doc(rst): better margin commit 7d466a1 Merge: fccc4a0 2995735 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:29:06 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/documentation-restructuring commit fccc4a0 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:15:45 2025 +0200 doc(notebooks and rst files): Applies changes from review, fixes some url commit f8611bb Author: spjuhel <[email protected]> Date: Mon Jun 2 16:10:56 2025 +0200 doc(docstring): Fixes too short header specifier commit 15aeeab Author: spjuhel <[email protected]> Date: Mon Jun 2 16:09:53 2025 +0200 doc(changelog): Fixes right arrow and minor bugs, typos. commit 9b1f7ac Author: Samuel Juhel <[email protected]> Date: Mon Jun 2 10:07:40 2025 +0200 Apply suggestions from code review Co-authored-by: Lukas Riedel <[email protected]> commit 2995735 Author: Emanuel Schmid <[email protected]> Date: Wed May 28 11:56:09 2025 +0200 Update URLs for WISC data (#944) * storm_europe: wisc.climate.copernicus.eu has moved to cds.climate.copernicus.eu * storm europe: update links * Add data links and improve docs of StormEurope --------- Co-authored-by: Lukas Riedel <[email protected]> commit 3d34cd9 Author: Samuel Juhel <[email protected]> Date: Wed May 28 11:45:47 2025 +0200 Implement equality methods for impf and impfset (#1027) * Implement equality methods for impf and impfset * Update tests --------- Co-authored-by: Lukas Riedel <[email protected]> commit ac13a72 Author: spjuhel <[email protected]> Date: Mon May 19 15:24:16 2025 +0200 Addresses env setup for develop/review commit d7cae4f Author: spjuhel <[email protected]> Date: Mon May 19 14:37:14 2025 +0200 improves Developer Guide index commit af793bc Author: Valentin Gebhart <[email protected]> Date: Fri May 16 17:40:51 2025 +0200 Add option in raster plot to crop around centroids (#1047) * add option to crop raster plots around centroids * update docstrings * change name of keyword parameter * change keyword name and improve docstring descriptions * updated changelog * change default value of mask parameter and update changelog commit 1a6df8e Author: Emanuel Schmid <[email protected]> Date: Fri May 16 12:59:44 2025 +0200 Avoid pickling shapely object in Exposures.write_hdf5 (#1051) * refactor Exposures.write_hdf5 and .from_hdf5: use wkb instead of pickle for geometry serialization * refactor Exposures.write_hdf5 * change of plan: just pickle geometries in wkb format * Update climada/entity/exposures/base.py Co-authored-by: Lukas Riedel <[email protected]> * abandon shapely pickling * simplify wkb columns collection * simplify wkb conversion * cosmetics --------- Co-authored-by: Lukas Riedel <[email protected]> commit 51b66fa Author: Emanuel Schmid <[email protected]> Date: Fri May 9 14:53:33 2025 +0200 Remove geopandas.datasets (#1052) Use cartopy.io.shapereader for loading natural earth data instead of geopandas commit a5a3fef Author: emanuel-schmid <[email protected]> Date: Tue Apr 29 13:01:13 2025 +0200 fix test_data_api commit d8b8e9a Author: Emanuel Schmid <[email protected]> Date: Thu Apr 24 15:16:06 2025 +0200 Raise ValueError in download_world_bank_indicator (#1050) * Fix worldbank fallback by raising a ValueError instead of a RuntimeError commit 4d2d690 Author: Lukas Riedel <[email protected]> Date: Wed Apr 16 09:41:20 2025 +0200 Remove pandas-datareader (#1033) * Remove pandas-datareader Use JSON/pandas solution for downloading World Bank indicator data. * Add function `download_world_bank_indicator`. * Add unit test. * Update requirements. * Update CHANGELOG.md * Remove stray print and fix comments * Switch to compatible Petals target branch for testing REVERT THIS! * Fix linter warnings - Add timeout parameter to requests call - Remove unused import * #168 is merged Co-authored-by: Lukas Riedel <[email protected]> * Apply suggestions from code review Use single list instead of nested lists Co-authored-by: Emanuel Schmid <[email protected]> * Update reading WB data * Fall back to parsing dates if conversion to ints fails. * Throw a ValueError if no data is available. --------- Co-authored-by: emanuel-schmid <[email protected]> Co-authored-by: Emanuel Schmid <[email protected]> commit a2d2297 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 16:21:48 2025 +0200 remove shapely 2.0 pin commit 6dc20ab Merge: eda7e40 2c34d49 Author: Samuel Juhel <[email protected]> Date: Mon Apr 7 14:44:24 2025 +0200 Merge pull request #1026 from CLIMADA-project/feature/improve_ee_import Better handling of optional dependency import for earth-engine commit 2c34d49 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:57:51 2025 +0200 pylint commit 3db15c5 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:35:04 2025 +0200 fix obvious errors commit 176db2d Merge: f2c27a7 eda7e40 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:08:30 2025 +0200 Merge branch 'develop' into feature/improve_ee_import commit eda7e40 Author: Emanuel Schmid <[email protected]> Date: Fri Apr 4 16:12:38 2025 +0200 Explicit arguments in TropCyclone.apply_climate_scenario_knu (#991) * trop_cyclone.apply_climate_scenario_knu: make yearly_steps argument explicit * changelog * readthedocs: explicit configuration file commit 004651b Merge: 3cfbe05 08ec51b Author: emanuel-schmid <[email protected]> Date: Fri Apr 4 12:45:23 2025 +0200 Merge branch 'main' into develop # Conflicts: # CHANGELOG.md # climada/_version.py # setup.py commit 08ec51b Author: Lukas Riedel <[email protected]> Date: Fri Apr 4 12:06:06 2025 +0200 Update GitHub infrastructure (#1036) * Increase fetch depth to avoid missing the commit The target commit might not be the latest of the target branch. * Add CODEOWNERS file * dependencies: pin shapley version down to 2.0 --------- Co-authored-by: emanuel-schmid <[email protected]> commit 3cfbe05 Merge: 5aeebea cc9b33a Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 18:20:05 2025 +0200 Merge pull request #1038 from CLIMADA-project/hotfix/plot_NaN_on_grid Hotfix: plot NaNs in geo_im_from_array commit cc9b33a Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 17:45:09 2025 +0200 update changelog commit 01eb0bd Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 17:34:59 2025 +0200 changed docstring and small optimization commit 94bc45d Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 12:09:45 2025 +0200 added edgecolor commit 3ddc5d9 Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 12:03:35 2025 +0200 adapted NaN plot handling and include legend commit 5aeebea Author: Lukas Riedel <[email protected]> Date: Wed Apr 2 10:18:31 2025 +0200 Add links to new CLIMADA webpage to docs (#1021) commit ead106c Author: Valentin Gebhart <[email protected]> Date: Mon Mar 31 17:24:48 2025 +0200 added section to local exceedance tutorial commit 8680668 Merge: 95052b2 25e4332 Author: luseverin <[email protected]> Date: Mon Mar 24 14:37:55 2025 +0100 Merge pull request #1029 from CLIMADA-project/feature/update_euler_guide_petals Add instructions to install climada petals on Euler commit 25e4332 Author: luseverin <[email protected]> Date: Mon Mar 24 13:54:05 2025 +0100 Update changelog commit 31cb34a Author: luseverin <[email protected]> Date: Mon Mar 24 11:23:58 2025 +0000 Specify how to work with a specific branch if needed commit 5b00f36 Author: luseverin <[email protected]> Date: Mon Mar 24 12:11:00 2025 +0100 Correct few typos and rephrase Co-authored-by: Lukas Riedel <[email protected]> commit 3b45cf9 Author: luseverin <[email protected]> Date: Fri Mar 21 19:17:15 2025 +0100 Add instructions to install climada petals on Euler commit 95052b2 Author: Lukas Riedel <[email protected]> Date: Wed Mar 19 10:34:15 2025 +0100 Upgrade to Python 3.12 (#870) * Upgrade to Python 3.12 * Increment supported Python versions in setup.py. * Update GitHub workflow testing matrix. * Upgrade eccodes and cfgrib versions * Add prominent information on Python versions --------- Co-authored-by: emanuel-schmid <[email protected]> commit a8a3c78 Author: emanuel-schmid <[email protected]> Date: Wed Mar 19 10:07:25 2025 +0100 fix broken plot test commit 5517c89 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 09:11:33 2025 +0100 Revert "change logo with QR code, the logo was ugly on the page" This reverts commit 5752673. commit 004a31f Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:49:49 2025 +0100 fix indent last dropdown getting started commit 8062f0e Merge: 5752673 88e305e Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:46:04 2025 +0100 Merge branch 'feature/documentation-restructuring' of https://github.com/CLIMADA-project/climada_python into feature/documentation-restructuring commit 5752673 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:45:25 2025 +0100 change logo with QR code commit 88e305e Author: spjuhel <[email protected]> Date: Wed Mar 19 08:35:07 2025 +0100 Tidying up after develop merged commit 9dcc2a3 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:24:14 2025 +0100 add links and images to getting started commit 898240d Merge: 6282eb7 ba6457c Author: spjuhel <[email protected]> Date: Tue Mar 18 18:28:47 2025 +0100 Merge branch 'develop' into feature/documentation-restructuring commit 6282eb7 Author: spjuhel <[email protected]> Date: Tue Mar 18 14:00:15 2025 +0100 Improves How to navigate page commit 2ef5bd7 Author: spjuhel <[email protected]> Date: Tue Mar 18 14:00:01 2025 +0100 This file is not used anymore commit fdcb215 Author: spjuhel <[email protected]> Date: Tue Mar 18 13:59:41 2025 +0100 Avoids section navigation in Changelog commit a666977 Author: spjuhel <[email protected]> Date: Tue Mar 18 13:58:27 2025 +0100 Final touch on urls commit 9a0ea1f Merge: 2d81ae1 f2c27a7 Author: spjuhel <[email protected]> Date: Tue Mar 18 12:01:39 2025 +0100 Merge branch 'feature/improve_ee_import' into feature/documentation-restructuring commit f2c27a7 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:57:23 2025 +0100 implements improvement commit 2d81ae1 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:42:20 2025 +0100 Removes some errors messages from documentation build (see details) Several attributes of Centroids became properties and were doctringed twice, I removed the attribute docstring and improved the properties ones. commit fb7cd37 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:41:35 2025 +0100 Adds some near final touch commit f4d851d Merge: 9962555 7b1a6bb Author: spjuhel <[email protected]> Date: Tue Mar 18 10:21:38 2025 +0100 Merge branch 'develop' into feature/documentation-restructuring commit 9962555 Author: spjuhel <[email protected]> Date: Tue Mar 18 10:08:32 2025 +0100 backtracking .md file hack commit 4102232 Author: spjuhel <[email protected]> Date: Mon Mar 17 17:50:35 2025 +0100 url fixing WIP commit 400eb73 Author: spjuhel <[email protected]> Date: Mon Mar 17 10:47:14 2025 +0100 wip on urls commit b442167 Author: Samuel Juhel <[email protected]> Date: Mon Mar 17 09:22:27 2025 +0100 Update urls in install.rst commit 304afb4 Author: climada <[email protected]> Date: Thu Mar 13 16:07:52 2025 +0000 'Automated update v6.0.1' commit bbf53a8 Merge: 3314b0b 7459ab8 Author: emanuel-schmid <[email protected]> Date: Thu Mar 13 16:40:23 2025 +0100 Merge branch 'develop' commit 3314b0b Merge: a0f6d7d edfce31 Author: emanuel-schmid <[email protected]> Date: Thu Mar 13 11:30:00 2025 +0100 Merge branch 'develop' # Conflicts: # climada/_version.py # setup.py commit e0d4e7e Author: Valentin Gebhart <[email protected]> Date: Tue Mar 11 16:44:31 2025 +0100 readd the navigation in getting started commit 97b108b Author: Nicolas Colombi <[email protected]> Date: Mon Mar 10 13:08:53 2025 +0100 getting started commit 68d2f3d Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:43:57 2025 +0100 Updates index.rst install title commit 2302e91 Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:38:36 2025 +0100 Updates impact.rst with landing content commit 754417f Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:26:53 2025 +0100 Updates exposures.rst with some landing content commit c95b7df Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:19:50 2025 +0100 Updates hazard.rst with some landing content commit 7c850a5 Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:17:25 2025 +0100 Updates User Guide landing page commit 029b81d Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 15:12:37 2025 +0100 Adds link to new website in top bar commit a0f6d7d Author: climada <[email protected]> Date: Mon Mar 3 14:11:00 2025 +0000 'Automated update v6.0.0' commit 18d3f6a Merge: f2dd9b8 51d1e82 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 14:32:56 2025 +0100 Merge branch 'develop' commit f2dd9b8 Author: Emanuel Schmid <[email protected]> Date: Mon Mar 3 14:24:50 2025 +0100 Fix Author List on Zenodo (#1011) * add .zenodo.json file * fix affiliation * update affiliation B.G. commit 8bb1011 Merge: 5fba3ab 0c462e8 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 11:37:15 2025 +0100 Merge branch 'develop' commit 5fba3ab Merge: e4a3cfd d0a6752 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 11:33:19 2025 +0100 Merge branch 'develop' into 'main' (towards release 6.0) commit 993ec4a Author: Samuel Juhel <[email protected]> Date: Mon Feb 24 09:33:47 2025 +0100 Update website link Co-authored-by: Emanuel Schmid <[email protected]> commit eec2487 Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 18:15:33 2025 +0100 fixed compiling headers issues commit c0681bd Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 16:58:56 2025 +0100 fixed white space commit ca6b749 Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 16:42:23 2025 +0100 updated conda installation instructions for different OS commit ef1c452 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:46:39 2025 +0100 forgot moving 10min climada notebook file commit c7f76c6 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:43:15 2025 +0100 Title level fixing and 10min to clim back in userguide commit f934609 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:48:41 2025 +0100 Reworks getting-started section commit e958b7c Author: spjuhel <[email protected]> Date: Tue Feb 4 13:40:33 2025 +0100 More linkref fixing commit e534253 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:37:50 2025 +0100 Restructures development guide with subsections - Fixes links in development guide - Minor renaming commit 17e1a96 Author: Valentin Gebhart <[email protected]> Date: Tue Feb 4 09:23:22 2025 +0100 fixed typos commit f584983 Merge: 1125d36 ac2c997 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 21:51:23 2025 +0100 Merge branch 'feature/documentation-restructuring' of github.com:CLIMADA-project/climada_python into feature/documentation-restructuring commit 1125d36 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 21:51:20 2025 +0100 add some warnings and info to mamba installation commit ac2c997 Author: spjuhel <[email protected]> Date: Mon Feb 3 14:42:26 2025 +0100 moves pages around commit 26c1063 Author: spjuhel <[email protected]> Date: Mon Feb 3 14:16:23 2025 +0100 fixes ``sphinx.configuration`` key is missing see https://about.readthedocs.com/blog/2024/12/deprecate-config-files-without-sphinx-or-mkdocs-config/ commit 225a734 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 11:25:58 2025 +0100 add data flow and workflow to dev intro commit ac6b540 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 10:51:57 2025 +0100 split climada dev and git intro commit bae24b5 Author: Valentin Gebhart <[email protected]> Date: Tue Jan 21 15:52:06 2025 +0100 first version of 10min CLIMADA intro commit 62dfd29 Author: Valentin Gebhart <[email protected]> Date: Mon Jan 6 16:18:01 2025 +0100 added draft for 10min intro commit 2dce78d Author: spjuhel <[email protected]> Date: Wed Dec 4 19:18:28 2024 +0100 changes conda to mamba commit 567a492 Author: spjuhel <[email protected]> Date: Wed Dec 4 19:02:44 2024 +0100 renames folder to match new naming commit efef761 Author: spjuhel <[email protected]> Date: Wed Dec 4 19:02:07 2024 +0100 creates the new toctrees to start seeing content commit 80c0694 Author: spjuhel <[email protected]> Date: Wed Dec 4 18:58:51 2024 +0100 improves navbar header rendering commit 8b5227c Author: spjuhel <[email protected]> Date: Wed Dec 4 18:58:06 2024 +0100 fixes docstrings indentations errors commit 1d05166 Author: spjuhel <[email protected]> Date: Fri Nov 15 09:02:01 2024 +0100 adds sphinx-design dependency commit de6d4bd Author: spjuhel <[email protected]> Date: Fri Nov 15 08:42:23 2024 +0100 Revert "Revert "Merge branch 'feature/documentation-restructuring' into develop"" This reverts commit b8cc3c4. commit e4a3cfd Author: climada <[email protected]> Date: Fri Jul 19 07:57:49 2024 +0000 'Automated update v5.0.0' commit 54cc800 Merge: 8f89ce1 70ddc93 Author: emanuel-schmid <[email protected]> Date: Thu Jul 18 18:20:02 2024 +0200 Merge branch 'develop' commit 8f89ce1 Author: Lukas Riedel <[email protected]> Date: Fri Jun 21 13:55:32 2024 +0200 Fix links in pull request template (#901)
1 parent a402d56 commit 89a8b24

File tree

134 files changed

+2540
-6829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+2540
-6829
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This is a comment.
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# These owners will be the default owners for everything in
5+
# the repo. Unless a later match takes precedence, they will
6+
# be requested for review when someone opens a pull request.
7+
* @emanuel-schmid @chahank @peanutfun

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# Do not abort other tests if only a single one fails
2323
fail-fast: false
2424
matrix:
25-
python-version: ["3.10", "3.11"]
25+
python-version: ["3.10", "3.11", "3.12"]
2626

2727
steps:
2828
-

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
ref: ${{ github.event.pull_request.head.sha }}
1717
-
1818
name: Checkout target commit
19-
run: git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=1 origin ${{ github.event.pull_request.base.ref }}
19+
run: git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=50 origin ${{ github.event.pull_request.base.ref }}
2020
-
2121
name: Set up Python 3.11
2222
uses: actions/setup-python@v5

.readthedocs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ python:
2525

2626
formats:
2727
- pdf
28+
29+
sphinx:
30+
configuration: doc/conf.py

CHANGELOG.md

Lines changed: 104 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,36 @@ Code freeze date: YYYY-MM-DD
1010

1111
### Dependency Changes
1212

13+
Removed:
14+
15+
- `pandas-datareader`
16+
1317
### Added
18+
- Added optional parameter to `geo_im_from_array`, `plot_from_gdf`, `plot_rp_imp`, `plot_rp_intensity`,
19+
`plot_intensity`, `plot_fraction`, `_event_plot` to mask plotting when regions are too far from data points [#1047](https://github.com/CLIMADA-project/climada_python/pull/1047). To recreate previous plots (no masking), the parameter can be set to None.
20+
- Added instructions to install Climada petals on Euler cluster in `doc.guide.Guide_Euler.ipynb` [#1029](https://github.com/CLIMADA-project/climada_python/pull/1029)
21+
22+
- `ImpactFunc` and `ImpactFuncSet` now support equality comparisons via `==` [#1027](https://github.com/CLIMADA-project/climada_python/pull/1027)
1423

1524
- `climada.entity.impact_funcs.base.ImpactFunc.__eq__` method
1625
- `climada.entity.impact_funcs.impact_func_set.ImpactFuncSet.__eq__` method
1726

1827
### Changed
28+
1929
- `Hazard.local_exceedance_intensity`, `Hazard.local_return_period` and `Impact.local_exceedance_impact`, `Impact.local_return_period`, using the `climada.util.interpolation` module: New default (no binning), binning on decimals, and faster implementation [#1012](https://github.com/CLIMADA-project/climada_python/pull/1012)
30+
- World Bank indicator data is now downloaded directly from their API via the function `download_world_bank_indicator`, instead of relying on the `pandas-datareader` package [#1033](https://github.com/CLIMADA-project/climada_python/pull/1033)
31+
- `Exposures.write_hdf5` pickles geometry data in WKB format, which is faster and more sustainable. [#1051](https://github.com/CLIMADA-project/climada_python/pull/1051)
32+
- The online documentation has been completely overhauled, now uses PyData theme: [#977](https://github.com/CLIMADA-project/climada_python/pull/977)
33+
2034
### Fixed
2135

36+
- NaN plotting issues in `geo_im_from_array`[#1038](https://github.com/CLIMADA-project/climada_python/pull/1038)
37+
- Broken ECMWF links in pydoc of `climada.hazard.storm_europe` relocated. [#944](https://github.com/CLIMADA-project/climada_python/pull/944)
38+
2239
### Deprecated
2340

2441
### Removed
42+
2543
- `climada.util.interpolation.round_to_sig_digits` [#1012](https://github.com/CLIMADA-project/climada_python/pull/1012)
2644

2745
## 6.0.1
@@ -45,27 +63,27 @@ Added:
4563

4664
Updated:
4765

48-
- `cartopy` >=0.23 &rarr; >=0.24
49-
- `cfgrib` >=0.9.9,<0.9.10 &rarr; >=0.9
50-
- `dask` >=2024.2,<2024.3 &rarr; >=2025.2
51-
- `eccodes` >=2.27,<2.28 &rarr; >=2.40
52-
- `gdal` >=3.6 &rarr; >=3.10
53-
- `geopandas` >=0.14 &rarr; >=0.14,<1.0
54-
- `h5py` >=3.8 &rarr; >=3.12
55-
- `haversine` >=2.8 &rarr; >=2.9
56-
- `matplotlib-base` >=3.9 &rarr; >=3.10
57-
- `netcdf4` >=1.6 &rarr; >=1.7
58-
- `numba` >=0.60 &rarr; >=0.61
59-
- `pillow` =9.4 &rarr; =11.1
60-
- `pyproj` >=3.5 &rarr; >=3.7
61-
- `pytables` >=3.7 &rarr; >=3.10
62-
- `python` =3.9 &rarr; =3.11
63-
- `rasterio` >=1.3 &rarr; >=1.4
64-
- `scikit-learn` >=1.5 &rarr; >=1.6
65-
- `scipy` >=1.13 &rarr; >=1.14,<1.15
66-
- `tqdm` >=4.66 &rarr; >=4.67
67-
- `xarray` >=2024.6 &rarr; >=2025.1
68-
- `xlsxwriter` >=3.1 &rarr; >=3.2
66+
- `cartopy` >=0.23 >=0.24
67+
- `cfgrib` >=0.9.9,<0.9.10 >=0.9
68+
- `dask` >=2024.2,<2024.3 >=2025.2
69+
- `eccodes` >=2.27,<2.28 >=2.40
70+
- `gdal` >=3.6 >=3.10
71+
- `geopandas` >=0.14 >=0.14,<1.0
72+
- `h5py` >=3.8 >=3.12
73+
- `haversine` >=2.8 >=2.9
74+
- `matplotlib-base` >=3.9 >=3.10
75+
- `netcdf4` >=1.6 >=1.7
76+
- `numba` >=0.60 >=0.61
77+
- `pillow` =9.4 =11.1
78+
- `pyproj` >=3.5 >=3.7
79+
- `pytables` >=3.7 >=3.10
80+
- `python` =3.9 =3.11
81+
- `rasterio` >=1.3 >=1.4
82+
- `scikit-learn` >=1.5 >=1.6
83+
- `scipy` >=1.13 >=1.14,<1.15
84+
- `tqdm` >=4.66 >=4.67
85+
- `xarray` >=2024.6 >=2025.1
86+
- `xlsxwriter` >=3.1 >=3.2
6987

7088
Removed:
7189

@@ -76,7 +94,7 @@ Removed:
7694
- `climada.hazard.tc_tracks.TCTracks.subset_years` function [#1023](https://github.com/CLIMADA-project/climada_python/pull/1023)
7795
- `climada.hazard.tc_tracks.TCTracks.from_FAST` function, add Australia basin (AU) [#993](https://github.com/CLIMADA-project/climada_python/pull/993)
7896
- Add `osm-flex` package to CLIMADA core [#981](https://github.com/CLIMADA-project/climada_python/pull/981)
79-
- `doc.tutorial.climada_entity_Exposures_osm.ipynb` tutorial explaining how to use `osm-flex`with CLIMADA
97+
- `doc.tutorial.climada_entity_Exposures_osm.ipynb` tutorial explaining how to use `osm-flex` with CLIMADA
8098
- `climada.util.coordinates.bounding_box_global` function [#980](https://github.com/CLIMADA-project/climada_python/pull/980)
8199
- `climada.util.coordinates.bounding_box_from_countries` function [#980](https://github.com/CLIMADA-project/climada_python/pull/980)
82100
- `climada.util.coordinates.bounding_box_from_cardinal_bounds` function [#980](https://github.com/CLIMADA-project/climada_python/pull/980)
@@ -108,8 +126,8 @@ Removed:
108126
- the _geometry_ column of the inherent `GeoDataFrame` is set up at initialization
109127
- 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`).
110128
- `Exposures.gdf` has been renamed to `Exposures.data` (it still works though, as it is a property now pointing to the latter)
111-
- the `check` method does not add a default "IMPF_" column to the GeoDataFrame anymore
112-
- Updated IBTrACS version from v4.0 to v4.1 ([#976](https://github.com/CLIMADA-project/climada_python/pull/976)
129+
- the `check` method does not add a default `'IMPF_'` column to the GeoDataFrame anymore
130+
- Updated IBTrACS version from v4.0 to v4.1 [#976](https://github.com/CLIMADA-project/climada_python/pull/976)
113131
- Fix xarray future warning in TCTracks for .dims to .sizes
114132
- Fix hazard.concatenate type test for pathos pools
115133

@@ -143,20 +161,20 @@ Added:
143161

144162
Updated:
145163

146-
- `bottleneck` >=1.3 &rarr; >=1.4
147-
- `cartopy` >=0.22 &rarr; >=0.23
148-
- `contextily` >=1.5 &rarr; >=1.6
149-
- `dask` >=2024.1,<2024.3 &rarr; >=2024.2,<2024.3
150-
- `matplotlib-base` >=3.8 &rarr; >=3.9
151-
- `numba` >=0.59 &rarr; >=0.60
152-
- `numexpr` >=2.9 &rarr; >=2.10
153-
- `pint` >=0.23 &rarr; >=0.24
154-
- `pycountry` >=22.3 &rarr; >=24.6
155-
- `requests` >=2.31 &rarr; >=2.32
156-
- `salib` >=1.4 &rarr; >=1.5
157-
- `scikit-learn` >=1.4 &rarr; >=1.5
158-
- `scipy` >=1.12 &rarr; >=1.13
159-
- `xarray` >=2024.2 &rarr; >=2024.6
164+
- `bottleneck` >=1.3 >=1.4
165+
- `cartopy` >=0.22 >=0.23
166+
- `contextily` >=1.5 >=1.6
167+
- `dask` >=2024.1,<2024.3 >=2024.2,<2024.3
168+
- `matplotlib-base` >=3.8 >=3.9
169+
- `numba` >=0.59 >=0.60
170+
- `numexpr` >=2.9 >=2.10
171+
- `pint` >=0.23 >=0.24
172+
- `pycountry` >=22.3 >=24.6
173+
- `requests` >=2.31 >=2.32
174+
- `salib` >=1.4 >=1.5
175+
- `scikit-learn` >=1.4 >=1.5
176+
- `scipy` >=1.12 >=1.13
177+
- `xarray` >=2024.2 >=2024.6
160178

161179
### Added
162180

@@ -191,6 +209,7 @@ CLIMADA tutorials. [#872](https://github.com/CLIMADA-project/climada_python/pull
191209
- `Impact.from_hdf5` now calls `str` on `event_name` data that is not strings, and issue a warning then [#894](https://github.com/CLIMADA-project/climada_python/pull/894)
192210
- `Impact.write_hdf5` now throws an error if `event_name` is does not contain strings exclusively [#894](https://github.com/CLIMADA-project/climada_python/pull/894)
193211
- Split `climada.hazard.trop_cyclone` module into smaller submodules without affecting module usage [#911](https://github.com/CLIMADA-project/climada_python/pull/911)
212+
- `yearly_steps` parameter of `TropCyclone.apply_climate_scenario_knu` has been made explicit [#991](https://github.com/CLIMADA-project/climada_python/pull/991)
194213

195214
### Fixed
196215

@@ -261,17 +280,17 @@ Added:
261280

262281
Updated:
263282

264-
- `contextily` >=1.3 &rarr; >=1.5
265-
- `dask` >=2023 &rarr; >=2024
266-
- `numba` >=0.57 &rarr; >=0.59
267-
- `pandas` >=2.1 &rarr; >=2.1,<2.2
268-
- `pint` >=0.22 &rarr; >=0.23
269-
- `scikit-learn` >=1.3 &rarr; >=1.4
270-
- `scipy` >=1.11 &rarr; >=1.12
271-
- `sparse` >=0.14 &rarr; >=0.15
272-
- `xarray` >=2023.8 &rarr; >=2024.1
273-
- `overpy` =0.6 &rarr; =0.7
274-
- `peewee` =3.16.3 &rarr; =3.17.1
283+
- `contextily` >=1.3 >=1.5
284+
- `dask` >=2023 >=2024
285+
- `numba` >=0.57 >=0.59
286+
- `pandas` >=2.1 >=2.1,<2.2
287+
- `pint` >=0.22 >=0.23
288+
- `scikit-learn` >=1.3 >=1.4
289+
- `scipy` >=1.11 >=1.12
290+
- `sparse` >=0.14 >=0.15
291+
- `xarray` >=2023.8 >=2024.1
292+
- `overpy` =0.6 =0.7
293+
- `peewee` =3.16.3 =3.17.1
275294

276295
Removed:
277296

@@ -280,7 +299,7 @@ Removed:
280299
### Added
281300

282301
- Convenience method `api_client.Client.get_dataset_file`, combining `get_dataset_info` and `download_dataset`, returning a single file objet. [#821](https://github.com/CLIMADA-project/climada_python/pull/821)
283-
- Read and Write methods to and from csv files for the `DiscRates` class. [#818](ttps://github.com/CLIMADA-project/climada_python/pull/818)
302+
- Read and Write methods to and from csv files for the `DiscRates` class. [#818](https://github.com/CLIMADA-project/climada_python/pull/818)
284303
- Add `CalcDeltaClimate` to unsequa module to allow uncertainty and sensitivity analysis of impact change calculations [#844](https://github.com/CLIMADA-project/climada_python/pull/844)
285304
- Add function `safe_divide` in util which handles division by zero and NaN values in the numerator or denominator [#844](https://github.com/CLIMADA-project/climada_python/pull/844)
286305
- Add reset_frequency option for the impact.select() function. [#847](https://github.com/CLIMADA-project/climada_python/pull/847)
@@ -314,13 +333,13 @@ Release date: 2023-09-27
314333

315334
Added:
316335

317-
- `matplotlib-base` None &rarr; >=3.8
336+
- `matplotlib-base` None >=3.8
318337

319338
Changed:
320339

321-
- `geopandas` >=0.13 &rarr; >=0.14
322-
- `pandas` >=1.5,<2.0 &rarr; >=2.1
323-
- `salib` >=1.3.0 &rarr; >=1.4.7
340+
- `geopandas` >=0.13 >=0.14
341+
- `pandas` >=1.5,<2.0 >=2.1
342+
- `salib` >=1.3.0 >=1.4.7
324343

325344
Removed:
326345

@@ -349,37 +368,37 @@ Added:
349368

350369
Changed:
351370

352-
- `cartopy` >=0.20.0,<0.20.3 &rarr; >=0.21
353-
- `cfgrib` >=0.9.7,<0.9.10 &rarr; =0.9.9
354-
- `contextily` >=1.0 &rarr; >=1.3
355-
- `dask` >=2.25 &rarr; >=2023
356-
- `eccodes` [auto] &rarr; =2.27
357-
- `gdal` !=3.4.1 &rarr; >=3.6
358-
- `geopandas` >=0.8 &rarr; >=0.13
359-
- `h5py` >=2.10 &rarr; >=3.8
360-
- `haversine` >=2.3 &rarr; >=2.8
361-
- `matplotlib` >=3.2,< 3.6 &rarr; >=3.7
362-
- `netcdf4` >=1.5 &rarr; >=1.6
363-
- `numba` >=0.51,!=0.55.0 &rarr; >=0.57
364-
- `openpyxl` >=3.0 &rarr; >=3.1
365-
- `pandas-datareader` >=0.9 &rarr; >=0.10
366-
- `pathos` >=0.2 &rarr; >=0.3
367-
- `pint` >=0.15 &rarr; >=0.22
368-
- `proj` !=9.0.0 &rarr; >=9.1
369-
- `pycountry` >=20.7 &rarr; >=22.3
370-
- `pytables` >=3.6 &rarr; >=3.7
371-
- `rasterio` >=1.2.7,<1.3 &rarr; >=1.3
372-
- `requests` >=2.24 &rarr; >=2.31
373-
- `salib` >=1.3.0 &rarr; >=1.4
374-
- `scikit-learn` >=1.0 &rarr; >=1.2
375-
- `scipy` >=1.6 &rarr; >=1.10
376-
- `sparse` >=0.13 &rarr; >=0.14
377-
- `statsmodels` >=0.11 &rarr; >=0.14
378-
- `tabulate` >=0.8 &rarr; >=0.9
379-
- `tqdm` >=4.48 &rarr; >=4.65
380-
- `xarray` >=0.13 &rarr; >=2023.5
381-
- `xlrd` >=1.2 &rarr; >=2.0
382-
- `xlsxwriter` >=1.3 &rarr; >=3.1
371+
- `cartopy` >=0.20.0,<0.20.3 >=0.21
372+
- `cfgrib` >=0.9.7,<0.9.10 =0.9.9
373+
- `contextily` >=1.0 >=1.3
374+
- `dask` >=2.25 >=2023
375+
- `eccodes` [auto] =2.27
376+
- `gdal` !=3.4.1 >=3.6
377+
- `geopandas` >=0.8 >=0.13
378+
- `h5py` >=2.10 >=3.8
379+
- `haversine` >=2.3 >=2.8
380+
- `matplotlib` >=3.2,< 3.6 >=3.7
381+
- `netcdf4` >=1.5 >=1.6
382+
- `numba` >=0.51,!=0.55.0 >=0.57
383+
- `openpyxl` >=3.0 >=3.1
384+
- `pandas-datareader` >=0.9 >=0.10
385+
- `pathos` >=0.2 >=0.3
386+
- `pint` >=0.15 >=0.22
387+
- `proj` !=9.0.0 >=9.1
388+
- `pycountry` >=20.7 >=22.3
389+
- `pytables` >=3.6 >=3.7
390+
- `rasterio` >=1.2.7,<1.3 >=1.3
391+
- `requests` >=2.24 >=2.31
392+
- `salib` >=1.3.0 >=1.4
393+
- `scikit-learn` >=1.0 >=1.2
394+
- `scipy` >=1.6 >=1.10
395+
- `sparse` >=0.13 >=0.14
396+
- `statsmodels` >=0.11 >=0.14
397+
- `tabulate` >=0.8 >=0.9
398+
- `tqdm` >=4.48 >=4.65
399+
- `xarray` >=0.13 >=2023.5
400+
- `xlrd` >=1.2 >=2.0
401+
- `xlsxwriter` >=1.3 >=3.1
383402

384403
Removed:
385404

CONTRIBUTING.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ For orientation, these are some categories of possible contributions we can thin
1212
* **New Modules and Utility Functions:** Did you create a function or an entire module you find useful for your work? Maybe you are not the only one! Feel free to simply raise a pull request for functions that improve, e.g., plotting or data handling. As an entire module has to be carefully integrated into the framework, it might help if you talk to us first so we can design the module and plan the next steps. You can do that by raising an issue or starting a [discussion](https://github.com/CLIMADA-project/climada_python/discussions) on GitHub.
1313

1414
A good place to start a personal discussion is our monthly CLIMADA developers call.
15-
Please contact the [lead developers](https://wcr.ethz.ch/research/climada.html) if you want to join.
15+
Please contact the [lead developers](https://climada.ethz.ch/team/) if you want to join.
1616

1717
## Why Should You Contribute?
1818

19-
* You will be listed as author of the CLIMADA repository in the [AUTHORS](AUTHORS.md) file.
19+
* You will be listed as author of the CLIMADA repository in the [AUTHORS][authors] file.
2020
* You will improve the quality of the CLIMADA software for you and for everybody else using it.
2121
* You will gain insights into scientific software development.
2222

@@ -40,7 +40,7 @@ To contribute follow these steps:
4040
```bash
4141
pylint
4242
```
43-
6. Add your name to the [AUTHORS](AUTHORS.md) file.
43+
6. Add your name to the [AUTHORS][authors] file.
4444
7. Push your updates to the remote repository:
4545
4646
```bash
@@ -83,4 +83,5 @@ It also contains a checklist for both pull request authors and reviewers to guid
8383
8484
[docs]: https://climada-python.readthedocs.io/en/latest/
8585
[devguide]: https://climada-python.readthedocs.io/en/latest/#developer-guide
86-
[testing]: https://climada-python.readthedocs.io/en/latest/guide/Guide_Testing.html
86+
[testing]: https://climada-python.readthedocs.io/en/latest/development/Guide_Testing.html
87+
[authors]: https://github.com/CLIMADA-project/climada_python/blob/main/AUTHORS.md

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ CLIMADA is divided into two parts (two repositories):
1616
1. the core [climada_python](https://github.com/CLIMADA-project/climada_python) contains all the modules necessary for the probabilistic impact, the averted damage, uncertainty and forecast calculations. Data for hazard, exposures and impact functions can be obtained from the [data API](https://github.com/CLIMADA-project/climada_python/blob/main/doc/tutorial/climada_util_api_client.ipynb). [Litpop](https://github.com/CLIMADA-project/climada_python/blob/main/doc/tutorial/climada_entity_LitPop.ipynb) is included as demo Exposures module, and [Tropical cyclones](https://github.com/CLIMADA-project/climada_python/blob/main/doc/tutorial/climada_hazard_TropCyclone.ipynb) is included as a demo Hazard module.
1717
2. the petals [climada_petals](https://github.com/CLIMADA-project/climada_petals) contains all the modules for generating data (e.g., TC_Surge, WildFire, OpenStreeMap, ...). Most development is done here. The petals builds-upon the core and does not work as a stand-alone.
1818

19-
It is recommend for new users to begin with the core (1) and the [tutorials](https://github.com/CLIMADA-project/climada_python/tree/main/doc/tutorial) therein.
19+
For new users, we recommend to begin with the core (1) and the [tutorials](https://github.com/CLIMADA-project/climada_python/tree/main/doc/tutorial) therein.
2020

21-
This is the Python (3.9+) version of CLIMADA - please see [here](https://github.com/davidnbresch/climada) for backward compatibility with the MATLAB version.
21+
This is the Python version of CLIMADA - please see [here](https://github.com/davidnbresch/climada) for backward compatibility with the MATLAB version.
2222

2323
## Getting started
2424

climada/engine/impact.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,7 @@ def plot_rp_imp(
11781178
return_periods=(25, 50, 100, 250),
11791179
log10_scale=True,
11801180
axis=None,
1181+
mask_distance=0.01,
11811182
kwargs_local_exceedance_impact=None,
11821183
**kwargs,
11831184
):
@@ -1194,6 +1195,11 @@ def plot_rp_imp(
11941195
plot impact as log10(impact). Default: True
11951196
smooth : bool, optional
11961197
smooth plot to plot.RESOLUTIONxplot.RESOLUTION. Default: True
1198+
mask_distance: float, optional
1199+
Only regions are plotted that are closer to any of the data points than this distance,
1200+
relative to overall plot size. For instance, to only plot values
1201+
at the centroids, use mask_distance=0.01. If None, the plot is not masked.
1202+
Default is 0.01.
11971203
kwargs_local_exceedance_impact: dict
11981204
Dictionary of keyword arguments for the method impact.local_exceedance_impact.
11991205
kwargs : dict, optional
@@ -1242,7 +1248,12 @@ def plot_rp_imp(
12421248
)
12431249

12441250
axis = u_plot.plot_from_gdf(
1245-
impacts_stats, title, column_labels, axis=axis, **kwargs
1251+
impacts_stats,
1252+
title,
1253+
column_labels,
1254+
axis=axis,
1255+
mask_distance=mask_distance,
1256+
**kwargs,
12461257
)
12471258
return axis, impacts_stats_vals
12481259

0 commit comments

Comments
 (0)