Skip to content

Commit 7874731

Browse files
emanuel-schmidemanuel-schmid
committed
Merge branch 'develop' into feature/costum_grid_litpop
2 parents 8f5ba60 + a5a3fef commit 7874731

Some content is hidden

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

42 files changed

+1188
-736
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/scripts/prepare_release.py‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
66
- update version numbers in _version.py and setup.py
77
- purge the "Unreleased" section of CHANGELOG.md and rename it to the new version number
8-
- copy the README.md file to doc/misc/README.md,
9-
but without the badges as they interfere with the sphinx doc builder
108
119
All changes are immediately commited to the repository.
1210
"""
@@ -51,17 +49,6 @@ def bump_version_number(version_number: str, level: str) -> str:
5149
return ".".join([major, minor, patch])
5250

5351

54-
def update_readme(_nvn):
55-
"""align doc/misc/README.md with ./README.md but remove the non-markdown header lines from"""
56-
with open("README.md", "r", encoding="UTF-8") as rmin:
57-
lines = [line for line in rmin.readlines() if not line.startswith("[![")]
58-
while not lines[0].strip():
59-
lines = lines[1:]
60-
with open("doc/misc/README.md", "w", encoding="UTF-8") as rmout:
61-
rmout.writelines(lines)
62-
return GitFile("doc/misc/README.md")
63-
64-
6552
def update_changelog(nvn):
6653
"""Rename the "Unreleased" section, remove unused subsections and the code-freeze date,
6754
set the release date to today"""
@@ -108,7 +95,7 @@ def update_changelog(nvn):
10895
if section_name:
10996
changelog.write(f"### {section_name}\n")
11097
lines = [
111-
ln.strip()
98+
ln.rstrip()
11299
for ln in section
113100
if "code freeze date: " not in ln.lower()
114101
]
@@ -227,7 +214,6 @@ def prepare_new_release(level):
227214
update_setup(new_version_number).gitadd()
228215
update_version(new_version_number).gitadd()
229216
update_changelog(new_version_number).gitadd()
230-
update_readme(new_version_number).gitadd()
231217

232218
Git().commit(new_version_number)
233219

‎.github/scripts/setup_devbranch.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ git pull
1111

1212
git checkout origin/main \
1313
setup.py \
14-
doc/misc/README.md \
1514
CHANGELOG.md \
1615
*/_version.py
1716

1817
release=`python .github/scripts/setup_devbranch.py`
1918

2019
git add \
2120
setup.py \
22-
doc/misc/README.md \
2321
CHANGELOG.md \
2422
*/_version.py
2523

‎.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/make-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will create a new release from main
22

33
# the new version number is the old one increased by 1 in the given level [major, minor, patch]
4-
# first, some files are modified (_version.py, setup.py, CHANGELOG.md and doc/misc/README.md)
4+
# first, some files are modified (_version.py, setup.py and CHANGELOG.md
55
# then, a new release is created on GitHub, tagged with v[new version number]
66

77
name: Create a new release

‎.github/workflows/postrelease-setup-devbranch.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
# the version number of setup.py and _version.py will be taken from main, but have a "-dev" appendix
44
# the CHANGELOG.md file will be updated and have a vanila "Unreleased" section
5-
# the doc/misc/README.md file is taken over from main
65

76
name: Post-release develop setup
87

‎.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

‎.zenodo.json‎

Lines changed: 123 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,124 @@
11
{
2-
"creators": [
3-
{
4-
"name": "Gabriela Aznar Siguan",
5-
"affiliation": "MeteoSwiss"
6-
},
7-
{
8-
"name": "David N. Bresch",
9-
"affiliation": "ETH Z\u00fcrich"
10-
},
11-
{
12-
"name": "Samuel Eberenz",
13-
"affiliation": "ETH Z\u00fcrich"
14-
},
15-
{
16-
"name": "Jan Hartman",
17-
"affiliation": "CelsiusPro"
18-
},
19-
{
20-
"name": "Marine Perus",
21-
"affiliation": "CelsiusPro"
22-
},
23-
{
24-
"name": "Thomas R\u00f6\u00f6sli"
25-
},
26-
{
27-
"name": "Dario Stocker"
28-
},
29-
{
30-
"name": "Veronica Bozzini"
31-
},
32-
{
33-
"name": "Carmen B. Steinmann"
34-
},
35-
{
36-
"name": "Evelyn M\u00fchlhofer",
37-
"affiliation": "MeteoSwiss"
38-
},
39-
{
40-
"name": "Rachel Bungerer"
41-
},
42-
{
43-
"name": "Inga J. Sauer"
44-
},
45-
{
46-
"name": "Samuel L\u00fcthi",
47-
"affiliation": "ETH Z\u00fcrich"
48-
},
49-
{
50-
"name": "Pui Man (Mannie) Kam",
51-
"affiliation": "ETH Z\u00fcrich"
52-
},
53-
{
54-
"name": "Simona Meiler",
55-
"affiliation": "ETH Z\u00fcrich"
56-
},
57-
{
58-
"name": "Alessio Ciullo",
59-
"affiliation": "ETH Z\u00fcrich"
60-
},
61-
{
62-
"name": "Thomas Vogt",
63-
"affiliation": "Potsdam Institute for Climate Impact Research"
64-
},
65-
{
66-
"name": "Benoit P. Guillod",
67-
"affiliation": "CLIMADA Technologies"
68-
},
69-
{
70-
"name": "Chahan M. Kropf",
71-
"affiliation": "ETH Z\u00fcrich"
72-
},
73-
{
74-
"name": "Emanuel Schmid",
75-
"affiliation": "ETH Z\u00fcrich"
76-
},
77-
{
78-
"name": "Chris Fairless",
79-
"affiliation": "CelsiusPro"
80-
},
81-
{
82-
"name": "Jan W\u00fcthrich"
83-
},
84-
{
85-
"name": "Z\u00e9lie Stalhandske",
86-
"affiliation": "ETH Z\u00fcrich"
87-
},
88-
{
89-
"name": "Yue Yu"
90-
},
91-
{
92-
"name": "Lukas Riedel",
93-
"affiliation": "ETH Z\u00fcrich"
94-
},
95-
{
96-
"name": "Raphael Portmann",
97-
"affiliation": "Agroscope"
98-
},
99-
{
100-
"name": "Nicolas Colombi",
101-
"affiliation": "ETH Z\u00fcrich"
102-
},
103-
{
104-
"name": "Leonie Villiger"
105-
},
106-
{
107-
"name": "Timo Schmid"
108-
},
109-
{
110-
"name": "Luca Severino"
111-
},
112-
{
113-
"name": "Samuel Juhel",
114-
"affiliation": "ETH Z\u00fcrich"
115-
},
116-
{
117-
"name": "Valentin Gebhart"
118-
}
119-
]
120-
}
2+
"title": "CLIMADA Core Python Package",
3+
4+
"description": "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.",
5+
6+
"creators": [
7+
{
8+
"name": "Gabriela Aznar Siguan",
9+
"affiliation": "MeteoSwiss"
10+
},
11+
{
12+
"name": "David N. Bresch",
13+
"affiliation": "ETH Z\u00fcrich"
14+
},
15+
{
16+
"name": "Samuel Eberenz",
17+
"affiliation": "ETH Z\u00fcrich"
18+
},
19+
{
20+
"name": "Jan Hartman",
21+
"affiliation": "CelsiusPro"
22+
},
23+
{
24+
"name": "Marine Perus",
25+
"affiliation": "CelsiusPro"
26+
},
27+
{
28+
"name": "Thomas R\u00f6\u00f6sli"
29+
},
30+
{
31+
"name": "Dario Stocker"
32+
},
33+
{
34+
"name": "Veronica Bozzini"
35+
},
36+
{
37+
"name": "Carmen B. Steinmann"
38+
},
39+
{
40+
"name": "Evelyn M\u00fchlhofer",
41+
"affiliation": "MeteoSwiss"
42+
},
43+
{
44+
"name": "Rachel Bungerer"
45+
},
46+
{
47+
"name": "Inga J. Sauer"
48+
},
49+
{
50+
"name": "Samuel L\u00fcthi",
51+
"affiliation": "ETH Z\u00fcrich"
52+
},
53+
{
54+
"name": "Pui Man (Mannie) Kam",
55+
"affiliation": "ETH Z\u00fcrich"
56+
},
57+
{
58+
"name": "Simona Meiler",
59+
"affiliation": "ETH Z\u00fcrich"
60+
},
61+
{
62+
"name": "Alessio Ciullo",
63+
"affiliation": "ETH Z\u00fcrich"
64+
},
65+
{
66+
"name": "Thomas Vogt",
67+
"affiliation": "Potsdam Institute for Climate Impact Research"
68+
},
69+
{
70+
"name": "Benoit P. Guillod",
71+
"affiliation": "CLIMADA Technologies"
72+
},
73+
{
74+
"name": "Chahan M. Kropf",
75+
"affiliation": "ETH Z\u00fcrich"
76+
},
77+
{
78+
"name": "Emanuel Schmid",
79+
"affiliation": "ETH Z\u00fcrich"
80+
},
81+
{
82+
"name": "Chris Fairless",
83+
"affiliation": "CelsiusPro"
84+
},
85+
{
86+
"name": "Jan W\u00fcthrich"
87+
},
88+
{
89+
"name": "Z\u00e9lie Stalhandske",
90+
"affiliation": "ETH Z\u00fcrich"
91+
},
92+
{
93+
"name": "Yue Yu"
94+
},
95+
{
96+
"name": "Lukas Riedel",
97+
"affiliation": "ETH Z\u00fcrich"
98+
},
99+
{
100+
"name": "Raphael Portmann",
101+
"affiliation": "Agroscope"
102+
},
103+
{
104+
"name": "Nicolas Colombi",
105+
"affiliation": "ETH Z\u00fcrich"
106+
},
107+
{
108+
"name": "Leonie Villiger"
109+
},
110+
{
111+
"name": "Timo Schmid"
112+
},
113+
{
114+
"name": "Luca Severino"
115+
},
116+
{
117+
"name": "Samuel Juhel",
118+
"affiliation": "ETH Z\u00fcrich"
119+
},
120+
{
121+
"name": "Valentin Gebhart"
122+
}
123+
]
124+
}

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,33 @@ Code freeze date: YYYY-MM-DD
1010

1111
### Dependency Changes
1212

13+
Removed:
14+
15+
- `pandas-datareader`
16+
1317
### Added
18+
- 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)
1419

1520
### Changed
21+
- `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)
22+
- 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)
1623

1724
### Fixed
25+
- NaN plotting issues in `geo_im_from_array`[#1038](https://github.com/CLIMADA-project/climada_python/pull/1038)
1826

1927
### Deprecated
2028

2129
### Removed
30+
- `climada.util.interpolation.round_to_sig_digits` [#1012](https://github.com/CLIMADA-project/climada_python/pull/1012)
31+
32+
## 6.0.1
33+
34+
Release date: 2025-03-13
35+
36+
### Fixed
37+
38+
- bug in `climada.util.coordinates.bounding_box_from_countries` occurring if the country is a polygon and not a multipolygon
39+
[#1018](https://github.com/CLIMADA-project/climada_python/pull/1018)
2240

2341
## 6.0.0
2442

@@ -60,6 +78,7 @@ Removed:
6078

6179
### Added
6280

81+
- `climada.hazard.tc_tracks.TCTracks.subset_years` function [#1023](https://github.com/CLIMADA-project/climada_python/pull/1023)
6382
- `climada.hazard.tc_tracks.TCTracks.from_FAST` function, add Australia basin (AU) [#993](https://github.com/CLIMADA-project/climada_python/pull/993)
6483
- Add `osm-flex` package to CLIMADA core [#981](https://github.com/CLIMADA-project/climada_python/pull/981)
6584
- `doc.tutorial.climada_entity_Exposures_osm.ipynb` tutorial explaining how to use `osm-flex`with CLIMADA
@@ -177,6 +196,7 @@ CLIMADA tutorials. [#872](https://github.com/CLIMADA-project/climada_python/pull
177196
- `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)
178197
- `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)
179198
- Split `climada.hazard.trop_cyclone` module into smaller submodules without affecting module usage [#911](https://github.com/CLIMADA-project/climada_python/pull/911)
199+
- `yearly_steps` parameter of `TropCyclone.apply_climate_scenario_knu` has been made explicit [#991](https://github.com/CLIMADA-project/climada_python/pull/991)
180200

181201
### Fixed
182202

0 commit comments

Comments
 (0)