Skip to content

Commit dec30ea

Browse files
ThomasBestfleischThomasBestfleisch
committed
Merge branch 'main' into documentation/tb_branch
2 parents be44ab3 + 4b91613 commit dec30ea

22 files changed

+695
-220
lines changed

‎.github/workflows/build-and-publish.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@ jobs:
1010

1111
cd-job:
1212
name: Continuous Delivery
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
steps:
1515

1616
- name: SCM Checkout
1717
uses: actions/checkout@v4
1818

1919
- name: Setup Python & Poetry Environment
20-
uses: exasol/python-toolbox/.github/actions/[email protected]
21-
with:
22-
poetry-version: 2.0.1
20+
uses: exasol/python-toolbox/.github/actions/[email protected]
2321

2422
- name: Build Artifacts
2523
run: poetry build

‎.github/workflows/check-release-tag.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ jobs:
77
check-tag-version-job:
88

99
name: Check Tag Version
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: SCM Checkout
1414
uses: actions/checkout@v4
1515

1616
- name: Setup Python & Poetry Environment
17-
uses: exasol/python-toolbox/.github/actions/[email protected]
18-
with:
19-
poetry-version: 2.0.1
17+
uses: exasol/python-toolbox/.github/actions/[email protected]
2018

2119
- name: Check Tag Version
2220
# make sure the pushed/created tag matched the project version

‎.github/workflows/checks.yml‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77

88
Version-Check:
99
name: Version
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: SCM Checkout
@@ -16,39 +16,50 @@ jobs:
1616
fetch-depth: 0
1717

1818
- name: Setup Python & Poetry Environment
19-
uses: exasol/python-toolbox/.github/actions/[email protected]
20-
with:
21-
poetry-version: 2.0.1
19+
uses: exasol/python-toolbox/.github/actions/[email protected]
2220

2321
- name: Check Version(s)
2422
run: poetry run version-check exasol/developer_documentation/version.py
2523

2624
Documentation:
2725
name: Docs
2826
needs: [ Version-Check ]
29-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-24.04
3028

3129
steps:
3230
- name: SCM Checkout
3331
uses: actions/checkout@v4
3432

3533
- name: Setup Python & Poetry Environment
36-
uses: exasol/python-toolbox/.github/actions/[email protected]
37-
with:
38-
poetry-version: 2.0.1
34+
uses: exasol/python-toolbox/.github/actions/[email protected]
3935

4036
- name: Build Documentation
4137
run: |
42-
poetry run python -m nox -s docs:build
38+
poetry run -- nox -s docs:build
4339
4440
build-matrix:
4541
name: Generate Build Matrix
4642
uses: ./.github/workflows/matrix-python.yml
4743

44+
Changelog:
45+
name: Changelog Update Check
46+
runs-on: ubuntu-24.04
47+
if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/master' }}
48+
49+
steps:
50+
- name: SCM Checkout
51+
uses: actions/checkout@v4
52+
53+
- name: Setup Python & Poetry Environment
54+
uses: exasol/python-toolbox/.github/actions/[email protected]
55+
56+
- name: Run changelog update check
57+
run: poetry run -- nox -s changelog:updated
58+
4859
Lint:
4960
name: Linting (Python-${{ matrix.python-version }})
5061
needs: [ Version-Check, build-matrix ]
51-
runs-on: ubuntu-latest
62+
runs-on: ubuntu-24.04
5263
strategy:
5364
fail-fast: false
5465
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -58,13 +69,12 @@ jobs:
5869
uses: actions/checkout@v4
5970

6071
- name: Setup Python & Poetry Environment
61-
uses: exasol/python-toolbox/.github/actions/python-environment@0.21.0
72+
uses: exasol/python-toolbox/.github/actions/python-environment@1.0.1
6273
with:
6374
python-version: ${{ matrix.python-version }}
64-
poetry-version: 2.0.1
6575

6676
- name: Run lint
67-
run: poetry run nox -s lint:code
77+
run: poetry run -- nox -s lint:code
6878

6979
- name: Upload Artifacts
7080
uses: actions/[email protected]
@@ -78,7 +88,7 @@ jobs:
7888
Type-Check:
7989
name: Type Checking (Python-${{ matrix.python-version }})
8090
needs: [ Version-Check, build-matrix ]
81-
runs-on: ubuntu-latest
91+
runs-on: ubuntu-24.04
8292
strategy:
8393
fail-fast: false
8494
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -88,18 +98,17 @@ jobs:
8898
uses: actions/checkout@v4
8999

90100
- name: Setup Python & Poetry Environment
91-
uses: exasol/python-toolbox/.github/actions/python-environment@0.21.0
101+
uses: exasol/python-toolbox/.github/actions/python-environment@1.0.1
92102
with:
93103
python-version: ${{ matrix.python-version }}
94-
poetry-version: 2.0.1
95104

96105
- name: Run type-check
97-
run: poetry run nox -s lint:typing
106+
run: poetry run -- nox -s lint:typing
98107

99108
Security:
100109
name: Security Checks (Python-${{ matrix.python-version }})
101110
needs: [ Version-Check, build-matrix ]
102-
runs-on: ubuntu-latest
111+
runs-on: ubuntu-24.04
103112
strategy:
104113
fail-fast: false
105114
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -109,13 +118,12 @@ jobs:
109118
uses: actions/checkout@v4
110119

111120
- name: Setup Python & Poetry Environment
112-
uses: exasol/python-toolbox/.github/actions/python-environment@0.21.0
121+
uses: exasol/python-toolbox/.github/actions/python-environment@1.0.1
113122
with:
114123
python-version: ${{ matrix.python-version }}
115-
poetry-version: 2.0.1
116124

117125
- name: Run security linter
118-
run: poetry run nox -s lint:security
126+
run: poetry run -- nox -s lint:security
119127

120128
- name: Upload Artifacts
121129
uses: actions/[email protected]
@@ -126,25 +134,22 @@ jobs:
126134

127135
Format:
128136
name: Format Check
129-
runs-on: ubuntu-latest
137+
runs-on: ubuntu-24.04
130138

131139
steps:
132140
- name: SCM Checkout
133141
uses: actions/checkout@v4
134142

135143
- name: Setup Python & Poetry Environment
136-
uses: exasol/python-toolbox/.github/actions/[email protected]
137-
with:
138-
python-version: "3.9"
139-
poetry-version: 2.0.1
144+
uses: exasol/python-toolbox/.github/actions/[email protected]
140145

141146
- name: Run format check
142-
run: poetry run nox -s project:format
147+
run: poetry run -- nox -s project:format
143148

144149
Tests:
145150
name: Unit-Tests (Python-${{ matrix.python-version }}, Exasol-${{ matrix.exasol-version}})
146151
needs: [ Documentation, Lint, Type-Check, Security, Format, build-matrix ]
147-
runs-on: ubuntu-latest
152+
runs-on: ubuntu-24.04
148153
env:
149154
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150155
strategy:
@@ -156,13 +161,12 @@ jobs:
156161
uses: actions/checkout@v4
157162

158163
- name: Setup Python & Poetry Environment
159-
uses: exasol/python-toolbox/.github/actions/python-environment@0.21.0
164+
uses: exasol/python-toolbox/.github/actions/python-environment@1.0.1
160165
with:
161166
python-version: ${{ matrix.python-version }}
162-
poetry-version: 2.0.1
163167

164168
- name: Run Tests and Collect Coverage
165-
run: poetry run nox -s test:unit -- -- --coverage
169+
run: poetry run -- nox -s test:unit -- --coverage
166170

167171
- name: Upload Artifacts
168172
uses: actions/[email protected]

‎.github/workflows/gh-pages.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88

99
documentation-job:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: SCM Checkout
@@ -16,13 +16,11 @@ jobs:
1616
fetch-depth: 0
1717

1818
- name: Setup Python & Poetry Environment
19-
uses: exasol/python-toolbox/.github/actions/[email protected]
20-
with:
21-
poetry-version: 2.0.1
19+
uses: exasol/python-toolbox/.github/actions/[email protected]
2220

2321
- name: Build Documentation
2422
run: |
25-
poetry run nox -s docs:multiversion
23+
poetry run -- nox -s docs:multiversion
2624
2725
- name: Deploy
2826
uses: JamesIves/[email protected]

‎.github/workflows/matrix-all.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,21 @@ on:
1010
jobs:
1111
all_versions:
1212

13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414

1515
steps:
1616
- name: SCM Checkout
1717
uses: actions/checkout@v4
1818

1919
- name: Setup Python & Poetry Environment
20-
uses: exasol/python-toolbox/.github/actions/[email protected]
21-
with:
22-
poetry-version: 2.0.1
20+
uses: exasol/python-toolbox/.github/actions/[email protected]
2321

2422
- name: Generate matrix
25-
run: poetry run nox -s matrix:all
23+
run: poetry run -- nox -s matrix:all
2624

2725
- id: set-matrix
2826
run: |
29-
echo "matrix=$(poetry run nox -s matrix:all)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:all)" >> $GITHUB_OUTPUT
3028
3129
outputs:
3230
matrix: ${{ steps.set-matrix.outputs.matrix }}

‎.github/workflows/matrix-exasol.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,21 @@ on:
1010
jobs:
1111
exasol_versions:
1212

13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414

1515
steps:
1616
- name: SCM Checkout
1717
uses: actions/checkout@v4
1818

1919
- name: Setup Python & Poetry Environment
20-
uses: exasol/python-toolbox/.github/actions/[email protected]
21-
with:
22-
poetry-version: 2.0.1
20+
uses: exasol/python-toolbox/.github/actions/[email protected]
2321

2422
- name: Generate matrix
25-
run: poetry run nox -s matrix:exasol
23+
run: poetry run -- nox -s matrix:exasol
2624

2725
- id: set-matrix
2826
run: |
29-
echo "matrix=$(poetry run nox -s matrix:exasol)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:exasol)" >> $GITHUB_OUTPUT
3028
3129
outputs:
3230
matrix: ${{ steps.set-matrix.outputs.matrix }}

‎.github/workflows/matrix-python.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,21 @@ on:
1010
jobs:
1111
python_versions:
1212

13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414

1515
steps:
1616
- name: SCM Checkout
1717
uses: actions/checkout@v4
1818

1919
- name: Setup Python & Poetry Environment
20-
uses: exasol/python-toolbox/.github/actions/[email protected]
21-
with:
22-
poetry-version: 2.0.1
20+
uses: exasol/python-toolbox/.github/actions/[email protected]
2321

2422
- name: Generate matrix
25-
run: poetry run nox -s matrix:python
23+
run: poetry run -- nox -s matrix:python
2624

2725
- id: set-matrix
2826
run: |
29-
echo "matrix=$(poetry run nox -s matrix:python)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:python)" >> $GITHUB_OUTPUT
3028
3129
outputs:
3230
matrix: ${{ steps.set-matrix.outputs.matrix }}

‎.github/workflows/merge-gate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# This job ensures inputs have been executed successfully.
1717
approve-merge:
1818
name: Allow Merge
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-24.04
2020
# If you need additional jobs to be part of the merge gate, add them below
2121
needs: [ fast-checks, slow-checks ]
2222

‎.github/workflows/report.yml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77

88
report:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
env:
1111
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1212

@@ -17,9 +17,7 @@ jobs:
1717
fetch-depth: 0
1818

1919
- name: Setup Python & Poetry Environment
20-
uses: exasol/python-toolbox/.github/actions/[email protected]
21-
with:
22-
poetry-version: 2.0.1
20+
uses: exasol/python-toolbox/.github/actions/[email protected]
2321

2422
- name: Download Artifacts
2523
uses: actions/[email protected]
@@ -29,31 +27,31 @@ jobs:
2927
- name: Copy Artifacts into Root Folder
3028
working-directory: ./artifacts
3129
run: |
32-
poetry run coverage combine --keep coverage-python3.9*/.coverage
30+
poetry run -- coverage combine --keep coverage-python3.9*/.coverage
3331
# Errors during copying are ignored because they are checked in the next step
3432
cp .coverage ../ || true
3533
cp lint-python3.9/.lint.txt ../ || true
36-
cp lint-python3.9/.lint.txt ../ || true
34+
cp lint-python3.9/.lint.json ../ || true
3735
cp security-python3.9/.security.json ../ || true
3836
3937
- name: Validate Artifacts
40-
run: poetry run nox -s artifacts:validate
38+
run: poetry run -- nox -s artifacts:validate
4139

4240
- name: Generate Report
43-
run: poetry run nox -s project:report -- -- --format json | tee metrics.json
41+
run: poetry run -- nox -s project:report -- --format json | tee metrics.json
4442

4543
- name: Upload Artifacts
4644
uses: actions/[email protected]
4745
with:
4846
name: metrics.json
4947
path: metrics.json
5048

51-
# - name: Generate GitHub Summary
52-
# run: |
53-
# echo -e "# Summary\n" >> $GITHUB_STEP_SUMMARY
54-
# poetry run nox -s project:report -- -- --format markdown >> $GITHUB_STEP_SUMMARY
55-
# poetry run nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY
56-
# echo -e "\n\n# Coverage\n" >> $GITHUB_STEP_SUMMARY
57-
# poetry run coverage report -- --format markdown >> $GITHUB_STEP_SUMMARY
58-
# poetry run tbx security pretty-print >> $GITHUB_STEP_SUMMARY
59-
# poetry run tbx security pretty-print .security.json >> $GITHUB_STEP_SUMMARY
49+
- name: Generate GitHub Summary
50+
run: |
51+
echo -e "# Summary\n" >> $GITHUB_STEP_SUMMARY
52+
poetry run -- nox -s project:report -- --format markdown >> $GITHUB_STEP_SUMMARY
53+
poetry run -- nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY
54+
echo -e "\n\n# Coverage\n" >> $GITHUB_STEP_SUMMARY
55+
poetry run -- coverage report --format markdown >> $GITHUB_STEP_SUMMARY || true
56+
poetry run -- tbx lint pretty-print >> $GITHUB_STEP_SUMMARY
57+
poetry run -- tbx security pretty-print .security.json >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)