Skip to content

Commit 6381a3c

Browse files
'Automated update v6.0.1'
1 parent 0668d70 commit 6381a3c

File tree

4 files changed

+29
-50
lines changed

4 files changed

+29
-50
lines changed

CHANGELOG.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
# Changelog
22

3-
## Unreleased
3+
## 6.0.1
44

5-
Release date: YYYY-MM-DD
6-
7-
Code freeze date: YYYY-MM-DD
8-
9-
### Description
5+
Release date: 2025-03-03
106

117
### Dependency Changes
128

139
- `climada` >=5.0 → >=6.0
1410

15-
### Added
16-
17-
### Changed
18-
19-
### Fixed
20-
21-
### Deprecated
22-
23-
### Removed
24-
2511
## 6.0.0
2612

2713
Release date: 2025-03-03

climada_petals/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '6.0.1-dev'
1+
__version__ = '6.0.1'

doc/misc/README.md

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
# CLIMADA
1+
# CLIMADA Petals
22

3-
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.).
3+
[CLIMADA](https://climada.ethz.ch/climada/) (CLIMate ADAptation) is a free and open-source software framework for climate risk assessment and adaptation
4+
option appraisal. Designed by a large scientific community, it helps reasearchers, policymakers, and businesses analyse the impacts of natural hazards and
5+
explore adaptation strategies.
46

5-
As of today, CLIMADA provides global coverage of major climate-related extreme-weather hazards at high resolution via a [data API](https://climada.ethz.ch/data-api/v1/docs), namely (i) tropical cyclones, (ii) river flood, (iii) agro drought and (iv) European winter storms, all at 4km spatial resolution - wildfire to be added soon. For all hazards, historic and probabilistic event sets exist, for some also under select climate forcing scenarios (RCPs) at distinct time horizons (e.g. 2040). See also [papers](https://github.com/CLIMADA-project/climada_papers) for details.
7+
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.
8+
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).
69

710
CLIMADA is divided into two parts (two repositories):
811

@@ -11,73 +14,63 @@ CLIMADA is divided into two parts (two repositories):
1114

1215
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.
1316

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

1619
## Getting started
1720

1821
CLIMADA runs on Windows, macOS and Linux.
19-
The released versions of CLIMADA are available from [conda-forge](https://anaconda.org/conda-forge/climada-petals).
22+
The released versions of CLIMADA are available from [conda-forge](https://anaconda.org/conda-forge/climada).
2023
Use the [Mamba](https://mamba.readthedocs.io/en/latest/) package manager to install it:
2124

2225
```shell
23-
mamba install -c conda-forge climada-petals
26+
mamba install -c conda-forge climada
2427
```
2528

2629
It is **highly recommended** to install CLIMADA into a **separate** Conda environment.
2730
See the [installation guide](https://climada-python.readthedocs.io/en/latest/guide/install.html) for further information.
2831

29-
Follow the [tutorial](https://climada-python.readthedocs.io/en/latest/tutorial/1_main_climada.html) `climada_python-x.y.z/doc/tutorial/1_main_climada.ipynb` in a Jupyter Notebook to see what can be done with CLIMADA and how.
32+
Follow the [tutorials](https://climada-python.readthedocs.io/en/stable/tutorial/1_main_climada.html) in a Jupyter Notebook to see what can be done with CLIMADA and how.
3033

3134
## Documentation
3235

33-
Documentation is available on Read the Docs:
34-
35-
Note that all the documentations has two versions,'latest' and 'stable', and explicit version numbers, such as 'v3.1.1', in the url path. 'latest' is created from the 'develop' branch and has the latest changes by developers, 'stable' from the latest release. For more details about documentation versions, please have a look at [here](https://readthedocs.org/projects/climada-python/versions/).
36+
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).
3637

3738
CLIMADA python:
3839

39-
* [online (recommended)](https://climada-python.readthedocs.io/en/latest/)
40-
* [PDF file](https://climada-python.readthedocs.io/_/downloads/en/stable/pdf/)
40+
- [online (recommended)](https://climada-python.readthedocs.io/en/latest/)
41+
- [PDF file](https://climada-python.readthedocs.io/_/downloads/en/stable/pdf/)
42+
- [core Tutorials on GitHub](https://github.com/CLIMADA-project/climada_python/tree/main/doc/tutorial)
4143

4244
CLIMADA petals:
4345

44-
* [online (recommended)](https://climada-petals.readthedocs.io/en/latest/)
45-
* [PDF file](https://climada-petals.readthedocs.io/_/downloads/en/stable/pdf/)
46-
* [petals Tutorials on GitHub](https://github.com/CLIMADA-project/climada_petals/tree/main/doc/tutorial)
46+
- [online (recommended)](https://climada-petals.readthedocs.io/en/latest/)
47+
- [PDF file](https://climada-petals.readthedocs.io/_/downloads/en/stable/pdf/)
48+
- [petals Tutorials on GitHub](https://github.com/CLIMADA-project/climada_petals/tree/main/doc/tutorial)
4749

4850
The documentation can also be [built locally](https://climada-python.readthedocs.io/en/latest/README.html).
4951

5052
## Citing CLIMADA
5153

52-
If you use CLIMADA please cite (in general, in particular for academic work) :
53-
54-
The [used version](https://zenodo.org/search?page=1&size=20&q=climada)
55-
56-
and/or the following published articles:
57-
58-
Aznar-Siguan, G. and Bresch, D. N., 2019: CLIMADA v1: a global weather and climate risk assessment platform, Geosci. Model Dev., 12, 3085–3097, https://doi.org/10.5194/gmd-12-3085-2019
54+
See the [Citation Guide](https://climada-python.readthedocs.io/en/latest/misc/citation.html).
5955

60-
Bresch, D. N. and Aznar-Siguan, G., 2021: CLIMADA v1.4.1: towards a globally consistent adaptation options appraisal tool, Geosci. Model Dev., 14, 351-363, https://doi.org/10.5194/gmd-14-351-2021
56+
Please use the following logo if you are presenting results obtained with or through CLIMADA:
6157

62-
Please see all CLIMADA-related scientific publications in our [repository of scientific publications](https://github.com/CLIMADA-project/climada_papers) and cite according to your use of select features, be it hazard set(s), exposure(s) ...
63-
64-
In presentations or other graphical material, as well as in reports etc., where applicable, please add the logo as follows:\
6558
![https://github.com/CLIMADA-project/climada_python/blob/main/doc/guide/img/CLIMADA_logo_QR.png](https://github.com/CLIMADA-project/climada_python/blob/main/doc/guide/img/CLIMADA_logo_QR.png?raw=true)
6659

67-
As key link, please use https://wcr.ethz.ch/research/climada.html, as it will last and provides a bit of an intro, especially for those not familiar with GitHub - plus a nice CLIMADA infographic towards the bottom of the page
68-
6960
## Contributing
7061

71-
See the [Contribution Guide](https://climada-python.readthedocs.io/en/latest/misc/CONTRIBUTING.html).
62+
We welcome any contribution to this repository, be it bugfixes and other code changes and additions, documentation improvements, or tutorial updates.
63+
64+
If you would like to contribute, please refer to our [Contribution Guide](CONTRIBUTING.md).
7265

7366
## Versioning
7467

75-
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [releases on this repository](https://github.com/CLIMADA-project/climada_petals/releases).
68+
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [releases on this repository](https://github.com/CLIMADA-project/climada_python/releases).
7669

7770
## License
7871

7972
Copyright (C) 2017 ETH Zurich, CLIMADA contributors listed in AUTHORS.
8073

81-
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
74+
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>
8275

83-
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
76+
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>

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
setup(
1414
name='climada_petals',
1515

16-
version='6.0.1-dev',
16+
version='6.0.1',
1717

1818
description='CLIMADA Extensions in Python',
1919

0 commit comments

Comments
 (0)