Skip to content

Commit 1407922

Browse files
emanuel-schmidemanuel-schmid
committed
Merge branch 'develop' into feature/wisc-relocation
2 parents d9193ea + eda7e40 commit 1407922

Some content is hidden

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

78 files changed

+4605
-1291
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: 2 additions & 2 deletions
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.9", "3.10", "3.11"]
25+
python-version: ["3.10", "3.11", "3.12"]
2626

2727
steps:
2828
-
@@ -74,6 +74,6 @@ jobs:
7474
needs: build-and-test
7575
with:
7676
core_branch: ${{ github.ref }}
77-
petals_branch: feature/exposures_crs
77+
petals_branch: develop
7878
permissions:
7979
checks: write

‎.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: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: GitHub CI
2+
3+
# Execute this for every pull request (opened, reopened, and synchronized)
4+
on: [pull_request]
5+
6+
jobs:
7+
pre-commit-checks:
8+
name: 'Core / Pre-Commit Checks'
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
-
13+
name: Checkout Repo
14+
uses: actions/checkout@v4
15+
with:
16+
ref: ${{ github.event.pull_request.head.sha }}
17+
-
18+
name: Checkout target commit
19+
run: git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=50 origin ${{ github.event.pull_request.base.ref }}
20+
-
21+
name: Set up Python 3.11
22+
uses: actions/setup-python@v5
23+
with:
24+
python-version: '3.11'
25+
-
26+
# Store the current date to use it as cache key
27+
name: Get current date
28+
id: date
29+
run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
30+
-
31+
name: Cache dependencies
32+
uses: actions/cache@v4
33+
with:
34+
path: |
35+
~/.cache/pip
36+
~/.cache/pre-commit
37+
key: ${{ github.event.pull_request.head.ref }}-${{ steps.date.outputs.date }}
38+
restore-keys: |
39+
${{ github.event.pull_request.head.ref }}
40+
${{ github.event.pull_request.base.ref }}
41+
develop
42+
main
43+
-
44+
name: Install pre-commit and hooks
45+
run: |
46+
pip install pre-commit
47+
pre-commit install --install-hooks
48+
-
49+
name: Run pre-commit checks
50+
run: pre-commit run --show-diff-on-failure --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}

‎.readthedocs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version: 2
22

3+
sphinx:
4+
configuration: doc/conf.py
5+
36
build:
47
os: "ubuntu-22.04"
58
tools:
@@ -8,7 +11,7 @@ build:
811
# Append fixed Python version to requirements
912
jobs:
1013
pre_create_environment:
11-
- echo " - python=3.9" >> requirements/env_climada.yml
14+
- echo " - python=3.11" >> requirements/env_climada.yml
1215

1316
conda:
1417
environment: requirements/env_climada.yml

‎.zenodo.json

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
{
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+
}

‎AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Emanuel Schmid
2424
* Chris Fairless
2525
* Jan Wüthrich
26-
* Zélie Standhanske
26+
* Zélie Stalhandske
2727
* Yue Yu
2828
* Lukas Riedel
2929
* Raphael Portmann

0 commit comments

Comments
 (0)