Skip to content

Commit 4129633

Browse files
ThijssThijss
committed
Merge remote-tracking branch 'origin/main' into feat/setup-model-public
2 parents 9afbbb5 + e8852b8 commit 4129633

File tree

14 files changed

+198
-179
lines changed

14 files changed

+198
-179
lines changed

‎.github/workflows/build-test-and-sonar.yml‎ renamed to ‎.github/workflows/build-test-release.yml‎

Lines changed: 30 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,9 @@
33
# SPDX-License-Identifier: MPL-2.0
44

55

6-
name: Build, Test, Sonar and Publish
6+
name: Build, Test and Release
77

88
on:
9-
push:
10-
branches:
11-
- main
12-
# run pipeline on pull request
13-
pull_request:
14-
# run pipeline on merge queue
15-
merge_group:
169
# run pipeline from another workflow
1710
workflow_call:
1811
inputs:
@@ -21,21 +14,16 @@ on:
2114
description: Create a (pre-)release when CI passes
2215
default: false
2316
required: false
24-
# run this workflow manually from the Actions tab
25-
workflow_dispatch:
26-
inputs:
27-
create_release:
28-
type: boolean
29-
description: Create a (pre-)release when CI passes
30-
default: false
31-
required: true
17+
outputs:
18+
tag:
19+
description: "The created release tag"
20+
value: ${{ jobs.github-release.outputs.tag }}
3221

3322
concurrency:
3423
group: ${{ github.workflow }}-${{ github.ref }}-main
3524
cancel-in-progress: true
3625

3726
jobs:
38-
3927
build-python:
4028
runs-on: ubuntu-latest
4129
outputs:
@@ -45,15 +33,20 @@ jobs:
4533
- name: Checkout source code
4634
uses: actions/checkout@v4
4735

48-
- name: Setup Python 3.11
36+
- name: Setup Python 3.13
4937
uses: actions/setup-python@v5
5038
with:
51-
python-version: "3.11"
39+
python-version: "3.13"
40+
41+
- name: Set PyPI version
42+
uses: PowerGridModel/pgm-version-bump@main
43+
with:
44+
token: ${{ secrets.GITHUB_TOKEN }}
5245

5346
- name: Build
5447
run: |
55-
pip install requests build
56-
python set_pypi_version.py
48+
cat PYPI_VERSION
49+
pip install build
5750
python -m build --outdir wheelhouse .
5851
5952
- name: Save version
@@ -66,44 +59,11 @@ jobs:
6659
name: power-grid-model-ds
6760
path: wheelhouse/
6861

69-
sonar-cloud:
70-
permissions:
71-
contents: write
72-
runs-on: ubuntu-latest
73-
steps:
74-
75-
- name: Checkout source code
76-
uses: actions/checkout@v4
77-
with:
78-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
79-
80-
- name: Setup Python 3.11
81-
uses: actions/setup-python@v5
82-
with:
83-
python-version: "3.11"
84-
85-
- name: Install in develop mode
86-
run: |
87-
pip install -e .[dev]
88-
89-
- name: Test and Coverage
90-
run: |
91-
coverage run -m pytest
92-
coverage xml
93-
coverage report --fail-under=80
94-
95-
- name: SonarCloud Scan
96-
if: ${{ (github.event_name == 'push') || (github.event.pull_request.head.repo.owner.login == 'PowerGridModel') }}
97-
uses: SonarSource/sonarqube-scan-action@v5
98-
env:
99-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
101-
10262
tests:
10363
needs: build-python
10464
strategy:
10565
matrix:
106-
os: [ubuntu-latest, macos-latest, windows-latest]
66+
os: [ ubuntu-latest, macos-latest, windows-latest ]
10767
python: ["3.11", "3.12", "3.13"]
10868
fail-fast: false
10969
runs-on: ${{ matrix.os }}
@@ -129,27 +89,24 @@ jobs:
12989
- name: Unit test and coverage
13090
run: pytest --verbose
13191

132-
publish:
92+
github-release:
13393
needs:
13494
- build-python
13595
- tests
136-
- sonar-cloud
13796
permissions:
13897
contents: write
139-
env:
140-
TWINE_USERNAME: ${{ secrets.PYPI_USER }}
141-
TWINE_PASSWORD: ${{ secrets.PYPI_PASS }}
14298
runs-on: ubuntu-latest
99+
outputs:
100+
tag: ${{ steps.tag.outputs.tag }}
143101
steps:
102+
- name: Setup Python 3.13
103+
uses: actions/setup-python@v5
104+
with:
105+
python-version: "3.13"
144106

145107
- name: Checkout source code
146108
uses: actions/checkout@v4 # needed by 'Prevent automatic major/minor release'
147109

148-
- name: Setup Python 3.11
149-
uses: actions/setup-python@v5
150-
with:
151-
python-version: "3.11"
152-
153110
- name: Load built wheel file
154111
uses: actions/download-artifact@v4
155112
with:
@@ -174,20 +131,20 @@ jobs:
174131
env:
175132
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
176133

177-
- name: Upload wheels
178-
if: (github.event_name == 'push') || ((github.event_name == 'workflow_dispatch') && (github.event.inputs.create_release == 'true'))
179-
run: |
180-
pip install twine
181-
echo "Publish to PyPI..."
182-
twine upload --verbose wheelhouse/*
134+
- name: Get tag
135+
id: tag
136+
run: echo "tag=v${{ needs.build-python.outputs.version }}" >> $GITHUB_OUTPUT
137+
138+
- name: Display tag
139+
run: echo "${{ steps.tag.outputs.tag }}"
183140

184141
- name: Release
185-
if: (github.event_name == 'push') || ((github.event_name == 'workflow_dispatch') && (github.event.inputs.create_release == 'true'))
142+
if: (inputs.create_release)
186143
uses: softprops/action-gh-release@v2
187144
with:
188145
files: |
189146
./wheelhouse/*
190-
tag_name: v${{ needs.build-python.outputs.version }}
147+
tag_name: ${{ steps.tag.outputs.tag }}
191148
prerelease: ${{github.ref != 'refs/heads/main'}}
192149
generate_release_notes: true
193150
target_commitish: ${{ github.sha }}

‎.github/workflows/check-code-quality.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
name: Check Code Quality
77

88
on:
9-
push:
10-
branches:
11-
- main
12-
# run pipeline on pull request
13-
pull_request:
14-
# run pipeline on merge queue
15-
merge_group:
169
# run pipeline from another workflow
1710
workflow_call:
1811

‎.github/workflows/ci.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <[email protected]>
2+
#
3+
# SPDX-License-Identifier: MPL-2.0
4+
5+
6+
name: CI Build
7+
8+
on:
9+
push:
10+
branches:
11+
- main # run pipeline on pull request
12+
pull_request:
13+
merge_group: # run pipeline on merge queue
14+
workflow_dispatch: # run this workflow manually from the Actions tab
15+
inputs:
16+
create_release:
17+
type: boolean
18+
description: Create a (pre-)release when CI passes
19+
default: false
20+
required: true
21+
22+
concurrency:
23+
group: ${{ github.workflow }}-${{ github.ref }}-ci-build
24+
cancel-in-progress: true
25+
26+
jobs:
27+
ci-started:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- run: echo "ci started"
31+
32+
build-test-release:
33+
name: build-test-release
34+
uses: "./.github/workflows/build-test-release.yml"
35+
permissions:
36+
contents: write
37+
with:
38+
create_release: ${{ (github.event_name == 'workflow_dispatch' && inputs.create_release) || (github.event_name == 'push') }}
39+
40+
check-code-quality:
41+
uses: "./.github/workflows/check-code-quality.yml"
42+
43+
reuse-compliance:
44+
uses: "./.github/workflows/reuse-compliance.yml"
45+
46+
ci-passed:
47+
runs-on: ubuntu-latest
48+
needs: [ci-started, build-test-release, check-code-quality, reuse-compliance]
49+
if: always()
50+
51+
steps:
52+
# this explicit check is needed cfr. https://github.com/orgs/community/discussions/75568
53+
- name: "Check whether all jobs passed"
54+
run: echo '${{ toJSON(needs) }}' | jq -e 'to_entries | all(.value.result == "success")'
55+
- run: echo "ci passed"
56+
57+
publish:
58+
name: Publish to PyPI
59+
runs-on: ubuntu-latest
60+
permissions:
61+
contents: write
62+
id-token: write # Required for Trusted Publishing
63+
needs: build-test-release
64+
if: (github.event_name == 'workflow_dispatch' && inputs.create_release) || github.event_name == 'push'
65+
66+
steps:
67+
- name: Download assets from latest GitHub release using gh CLI
68+
env:
69+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70+
run: |
71+
mkdir -p assets-to-publish
72+
release_tag="${{ needs.build-test-release.outputs.tag }}"
73+
gh release download "$release_tag" --repo "$GITHUB_REPOSITORY" --dir assets-to-publish
74+
75+
- name: List downloaded assets
76+
run: ls -la assets-to-publish
77+
78+
- name: Upload assets to PyPI
79+
uses: pypa/gh-action-pypi-publish@release/v1
80+
with:
81+
# To test, use the TestPyPI:
82+
# repository-url: https://test.pypi.org/legacy/
83+
# You must also create an account and project on TestPyPI,
84+
# as well as set the trusted-publisher in the project settings:
85+
# https://docs.pypi.org/trusted-publishers/adding-a-publisher/
86+
# To publish to the official PyPI repository, just keep
87+
# repository-url commented out.
88+
packages-dir: assets-to-publish
89+
skip-existing: true
90+
print-hash: true
91+
verbose: true

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
main:
19-
uses: "./.github/workflows/build-test-and-sonar.yml"
18+
build-test-release:
19+
uses: "./.github/workflows/build-test-release.yml"
2020
permissions:
2121
contents: write
2222
with:

‎.github/workflows/reuse-compliance.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
name: REUSE Compliance Check
77

88
on:
9-
push:
10-
branches:
11-
- main
12-
# run pipeline on pull request
13-
pull_request:
14-
# run pipeline on merge queue
15-
merge_group:
169
# run pipeline from another workflow
1710
workflow_call:
1811
# run this workflow manually from the Actions tab

‎.github/workflows/sonar.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <[email protected]>
2+
#
3+
# SPDX-License-Identifier: MPL-2.0
4+
5+
name: Sonar Cloud
6+
7+
on:
8+
# run pipeline on push event of main branch
9+
push:
10+
branches:
11+
- main
12+
# run pipeline on pull request
13+
pull_request:
14+
# run pipeline on merge queue
15+
merge_group:
16+
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}-sonar
19+
cancel-in-progress: true
20+
21+
jobs:
22+
sonar-cloud:
23+
permissions:
24+
contents: write
25+
runs-on: ubuntu-latest
26+
steps:
27+
28+
- name: Checkout source code
29+
uses: actions/checkout@v4
30+
with:
31+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
32+
33+
- name: Setup Python 3.11
34+
uses: actions/setup-python@v5
35+
with:
36+
python-version: "3.11"
37+
38+
- name: Install in develop mode
39+
run: |
40+
pip install -e .[dev]
41+
42+
- name: Test and Coverage
43+
run: |
44+
coverage run -m pytest
45+
coverage xml
46+
coverage report --fail-under=80
47+
48+
- name: SonarCloud Scan
49+
if: ${{ (github.event_name == 'push') || (github.event.pull_request.head.repo.owner.login == 'PowerGridModel') }}
50+
uses: SonarSource/sonarqube-scan-action@v5
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ SPDX-License-Identifier: MPL-2.0
99
[![Downloads](https://static.pepy.tech/badge/power-grid-model-ds)](https://pepy.tech/project/power-grid-model-ds)
1010
[![Downloads](https://static.pepy.tech/badge/power-grid-model-ds/month)](https://pepy.tech/project/power-grid-model-ds)
1111

12-
[![Build and Test Python](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/build-test-and-sonar.yml)
13-
[![Check Code Quality](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/check-code-quality.yml)
14-
[![REUSE Compliance Check](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/reuse-compliance.yml)
12+
[![CI Build](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml/badge.svg)](https://github.com/PowerGridModel/power-grid-model-ds/actions/workflows/ci.yml)
1513
[![docs](https://readthedocs.org/projects/power-grid-model-ds/badge/)](https://power-grid-model-ds.readthedocs.io/en/stable/)
1614

1715
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=PowerGridModel_power-grid-model-ds&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=PowerGridModel_power-grid-model-ds)
@@ -25,7 +23,7 @@ SPDX-License-Identifier: MPL-2.0
2523

2624
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14825565.svg)](https://zenodo.org/record/14825565)
2725

28-
[![](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
26+
[![Power Grid Model logo](https://github.com/PowerGridModel/.github/blob/main/artwork/svg/color.svg)](#)
2927

3028
# Power Grid Model Data Science (DS)
3129

0 commit comments

Comments
 (0)