Skip to content

Commit 6581ba3

Browse files
Jannis-MittenzweiJannis-Mittenzwei
committed
Merge branch 'main' into feature/#368-Add-Nox-task-for-full-release
2 parents 7d99dd9 + 9d6891b commit 6581ba3

Some content is hidden

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

50 files changed

+1170
-667
lines changed

‎.github/actions/python-environment/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
poetry-version:
1212
description: 'Poetry version to use'
1313
required: true
14-
default: "1.2.2"
14+
default: "2.1.2"
1515

1616
runs:
1717

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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

‎.github/workflows/checks.yml‎

Lines changed: 17 additions & 35 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
@@ -19,12 +19,12 @@ jobs:
1919
uses: ./.github/actions/python-environment
2020

2121
- name: Check Version(s)
22-
run: poetry run version-check `poetry run python -c "from noxconfig import PROJECT_CONFIG; print(PROJECT_CONFIG.version_file)"`
22+
run: poetry run version-check `poetry run -- python -c "from noxconfig import PROJECT_CONFIG; print(PROJECT_CONFIG.version_file)"`
2323

2424
Documentation:
2525
name: Docs
2626
needs: [ Version-Check ]
27-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-24.04
2828

2929
steps:
3030
- name: SCM Checkout
@@ -35,11 +35,11 @@ jobs:
3535

3636
- name: Build Documentation
3737
run: |
38-
poetry run python -m nox -s docs:build
38+
poetry run -- nox -s docs:build
3939
4040
Changelog:
4141
name: Changelog Update Check
42-
runs-on: ubuntu-latest
42+
runs-on: ubuntu-24.04
4343

4444
steps:
4545
- name: SCM Checkout
@@ -54,7 +54,8 @@ jobs:
5454
python-version: "3.9"
5555

5656
- name: Run changelog update check
57-
run: poetry run nox -s changelog:updated
57+
if: ${{ github.ref != 'refs/heads/main' }}
58+
run: poetry run -- nox -s changelog:updated
5859

5960
build-matrix:
6061
name: Generate Build Matrix
@@ -63,7 +64,7 @@ jobs:
6364
Lint:
6465
name: Linting (Python-${{ matrix.python-version }})
6566
needs: [ Version-Check, build-matrix ]
66-
runs-on: ubuntu-latest
67+
runs-on: ubuntu-24.04
6768
strategy:
6869
fail-fast: false
6970
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -78,7 +79,7 @@ jobs:
7879
python-version: ${{ matrix.python-version }}
7980

8081
- name: Run lint
81-
run: poetry run nox -s lint:code
82+
run: poetry run -- nox -s lint:code
8283

8384
- name: Upload Artifacts
8485
uses: actions/[email protected]
@@ -92,7 +93,7 @@ jobs:
9293
Type-Check:
9394
name: Type Checking (Python-${{ matrix.python-version }})
9495
needs: [ Version-Check, build-matrix ]
95-
runs-on: ubuntu-latest
96+
runs-on: ubuntu-24.04
9697
strategy:
9798
fail-fast: false
9899
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -107,12 +108,12 @@ jobs:
107108
python-version: ${{ matrix.python-version }}
108109

109110
- name: Run type-check
110-
run: poetry run nox -s lint:typing
111+
run: poetry run -- nox -s lint:typing
111112

112113
Security:
113114
name: Security Checks (Python-${{ matrix.python-version }})
114115
needs: [ Version-Check, build-matrix ]
115-
runs-on: ubuntu-latest
116+
runs-on: ubuntu-24.04
116117
strategy:
117118
fail-fast: false
118119
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -127,7 +128,7 @@ jobs:
127128
python-version: ${{ matrix.python-version }}
128129

129130
- name: Run security linter
130-
run: poetry run nox -s lint:security
131+
run: poetry run -- nox -s lint:security
131132

132133
- name: Upload Artifacts
133134
uses: actions/[email protected]
@@ -136,28 +137,9 @@ jobs:
136137
path: .security.json
137138
include-hidden-files: true
138139

139-
Vulnerabilities:
140-
name: Check Vulnerabilities (Python-${{ matrix.python-version }})
141-
needs: [ Version-Check, build-matrix ]
142-
runs-on: ubuntu-latest
143-
strategy:
144-
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
145-
146-
steps:
147-
- name: SCM Checkout
148-
uses: actions/checkout@v4
149-
150-
- name: Setup Python & Poetry Environment
151-
uses: ./.github/actions/python-environment
152-
with:
153-
python-version: ${{ matrix.python-version }}
154-
155-
- name: Run Package vulnerabilities Check
156-
run: poetry run nox -s dependency:audit
157-
158140
Format:
159141
name: Format Check
160-
runs-on: ubuntu-latest
142+
runs-on: ubuntu-24.04
161143

162144
steps:
163145
- name: SCM Checkout
@@ -169,12 +151,12 @@ jobs:
169151
python-version: "3.9"
170152

171153
- name: Run format check
172-
run: poetry run nox -s project:format
154+
run: poetry run -- nox -s project:format
173155

174156
Tests:
175157
name: Unit-Tests (Python-${{ matrix.python-version }})
176158
needs: [ Documentation, Lint, Type-Check, Security, Format, build-matrix ]
177-
runs-on: ubuntu-latest
159+
runs-on: ubuntu-24.04
178160
env:
179161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
180162
strategy:
@@ -191,7 +173,7 @@ jobs:
191173
python-version: ${{ matrix.python-version }}
192174

193175
- name: Run Tests and Collect Coverage
194-
run: poetry run nox -s test:unit -- -- --coverage
176+
run: poetry run -- nox -s test:unit -- --coverage
195177

196178
- name: Upload Artifacts
197179
uses: actions/[email protected]

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

Lines changed: 2 additions & 2 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
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Build Documentation
2222
run: |
23-
poetry run nox -s docs:multiversion
23+
poetry run -- nox -s docs:multiversion
2424
2525
- name: Deploy
2626
uses: JamesIves/[email protected]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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
@@ -20,11 +20,11 @@ jobs:
2020
uses: ./.github/actions/python-environment
2121

2222
- name: Generate matrix
23-
run: poetry run nox -s matrix:all
23+
run: poetry run -- nox -s matrix:all
2424

2525
- id: set-matrix
2626
run: |
27-
echo "matrix=$(poetry run nox -s matrix:all)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:all)" >> $GITHUB_OUTPUT
2828
2929
outputs:
3030
matrix: ${{ steps.set-matrix.outputs.matrix }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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
@@ -20,11 +20,11 @@ jobs:
2020
uses: ./.github/actions/python-environment
2121

2222
- name: Generate matrix
23-
run: poetry run nox -s matrix:exasol
23+
run: poetry run -- nox -s matrix:exasol
2424

2525
- id: set-matrix
2626
run: |
27-
echo "matrix=$(poetry run nox -s matrix:exasol)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:exasol)" >> $GITHUB_OUTPUT
2828
2929
outputs:
3030
matrix: ${{ steps.set-matrix.outputs.matrix }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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
@@ -20,11 +20,11 @@ jobs:
2020
uses: ./.github/actions/python-environment
2121

2222
- name: Generate matrix
23-
run: poetry run nox -s matrix:python
23+
run: poetry run -- nox -s matrix:python
2424

2525
- id: set-matrix
2626
run: |
27-
echo "matrix=$(poetry run nox -s matrix:python)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:python)" >> $GITHUB_OUTPUT
2828
2929
outputs:
3030
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: 9 additions & 9 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

@@ -27,18 +27,18 @@ jobs:
2727
- name: Copy Artifacts into Root Folder
2828
working-directory: ./artifacts
2929
run: |
30-
poetry run coverage combine --keep coverage-python3.9*/.coverage
30+
poetry run -- coverage combine --keep coverage-python3.9*/.coverage
3131
# Errors during copying are ignored because they are checked in the next step
3232
cp .coverage ../ || true
3333
cp lint-python3.9/.lint.txt ../ || true
3434
cp lint-python3.9/.lint.json ../ || true
3535
cp security-python3.9/.security.json ../ || true
3636
3737
- name: Validate Artifacts
38-
run: poetry run nox -s artifacts:validate
38+
run: poetry run -- nox -s artifacts:validate
3939

4040
- name: Generate Report
41-
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
4242

4343
- name: Upload Artifacts
4444
uses: actions/[email protected]
@@ -49,9 +49,9 @@ jobs:
4949
- name: Generate GitHub Summary
5050
run: |
5151
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
52+
poetry run -- nox -s project:report -- --format markdown >> $GITHUB_STEP_SUMMARY
53+
poetry run -- nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY
5454
echo -e "\n\n# Coverage\n" >> $GITHUB_STEP_SUMMARY
55-
poetry run coverage report -- --format markdown >> $GITHUB_STEP_SUMMARY
56-
poetry run tbx lint pretty-print >> $GITHUB_STEP_SUMMARY
57-
poetry run tbx security pretty-print .security.json >> $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)