Skip to content

Commit fd4252a

Browse files
ArBridgemanArBridgeman
authored
Refactoring/68 update poetry to 2.1.2 (#69)
* Update exasol-toolbox to 1.1.0 * Remove matrix-exasol.yml as unused workflow * Update poetry run <command> to poetry run -- <command> for poetry 2.1+ compatibility * Update poetry to 2.1.2
1 parent 33a0806 commit fd4252a

15 files changed

Lines changed: 940 additions & 507 deletions

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ 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/python-environment@0.20.0
20+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
21+
with:
22+
poetry-version: '2.1.2'
2123

2224
- name: Build Artifacts
2325
run: poetry build

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ 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/python-environment@0.20.0
17+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
18+
with:
19+
poetry-version: '2.1.2'
1820

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

‎.github/workflows/checks.yml‎

Lines changed: 55 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ name: Checks
22

33
on:
44
workflow_call:
5-
secrets:
6-
ALTERNATIVE_GITHUB_TOKEN:
7-
required: false
85

96
jobs:
107

118
Version-Check:
129
name: Version
13-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1411

1512
steps:
1613
- name: SCM Checkout
@@ -19,36 +16,57 @@ jobs:
1916
fetch-depth: 0
2017

2118
- name: Setup Python & Poetry Environment
22-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
19+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
20+
with:
21+
poetry-version: '2.1.2'
2322

2423
- name: Check Version(s)
2524
run: |
26-
poetry run version-check exasol/error/version.py
25+
poetry run -- version-check exasol/error/version.py
2726
2827
Documentation:
2928
name: Docs
3029
needs: [ Version-Check ]
31-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-24.04
3231

3332
steps:
3433
- name: SCM Checkout
3534
uses: actions/checkout@v4
3635

3736
- name: Setup Python & Poetry Environment
38-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
37+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
38+
with:
39+
poetry-version: '2.1.2'
3940

4041
- name: Build Documentation
4142
run: |
42-
poetry run python -m nox -s docs:build
43+
poetry run -- nox -s docs:build
4344
4445
build-matrix:
4546
name: Generate Build Matrix
4647
uses: ./.github/workflows/matrix-python.yml
4748

49+
Changelog:
50+
name: Changelog Update Check
51+
runs-on: ubuntu-24.04
52+
if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/master' }}
53+
54+
steps:
55+
- name: SCM Checkout
56+
uses: actions/checkout@v4
57+
58+
- name: Setup Python & Poetry Environment
59+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
60+
with:
61+
poetry-version: '2.1.2'
62+
63+
- name: Run changelog update check
64+
run: poetry run -- nox -s changelog:updated
65+
4866
Lint:
4967
name: Linting (Python-${{ matrix.python-version }})
5068
needs: [ Version-Check, build-matrix ]
51-
runs-on: ubuntu-latest
69+
runs-on: ubuntu-24.04
5270
strategy:
5371
fail-fast: false
5472
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -58,24 +76,27 @@ jobs:
5876
uses: actions/checkout@v4
5977

6078
- name: Setup Python & Poetry Environment
61-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
79+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
6280
with:
6381
python-version: ${{ matrix.python-version }}
82+
poetry-version: '2.1.2'
6483

6584
- name: Run lint
66-
run: poetry run nox -s lint:code
85+
run: poetry run -- nox -s lint:code
6786

6887
- name: Upload Artifacts
69-
uses: actions/upload-artifact@v4.4.0
88+
uses: actions/upload-artifact@v4.6.2
7089
with:
7190
name: lint-python${{ matrix.python-version }}
72-
path: .lint.txt
91+
path: |
92+
.lint.txt
93+
.lint.json
7394
include-hidden-files: true
7495

7596
Type-Check:
7697
name: Type Checking (Python-${{ matrix.python-version }})
7798
needs: [ Version-Check, build-matrix ]
78-
runs-on: ubuntu-latest
99+
runs-on: ubuntu-24.04
79100
strategy:
80101
fail-fast: false
81102
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -85,17 +106,18 @@ jobs:
85106
uses: actions/checkout@v4
86107

87108
- name: Setup Python & Poetry Environment
88-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
109+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
89110
with:
90111
python-version: ${{ matrix.python-version }}
112+
poetry-version: '2.1.2'
91113

92114
- name: Run type-check
93-
run: poetry run nox -s lint:typing
115+
run: poetry run -- nox -s lint:typing
94116

95117
Security:
96118
name: Security Checks (Python-${{ matrix.python-version }})
97119
needs: [ Version-Check, build-matrix ]
98-
runs-on: ubuntu-latest
120+
runs-on: ubuntu-24.04
99121
strategy:
100122
fail-fast: false
101123
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -105,42 +127,43 @@ jobs:
105127
uses: actions/checkout@v4
106128

107129
- name: Setup Python & Poetry Environment
108-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
130+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
109131
with:
110132
python-version: ${{ matrix.python-version }}
133+
poetry-version: '2.1.2'
111134

112135
- name: Run security linter
113-
run: poetry run nox -s lint:security
136+
run: poetry run -- nox -s lint:security
114137

115138
- name: Upload Artifacts
116-
uses: actions/upload-artifact@v4.4.0
139+
uses: actions/upload-artifact@v4.6.2
117140
with:
118141
name: security-python${{ matrix.python-version }}
119142
path: .security.json
120143
include-hidden-files: true
121144

122145
Format:
123146
name: Format Check
124-
runs-on: ubuntu-latest
147+
runs-on: ubuntu-24.04
125148

126149
steps:
127150
- name: SCM Checkout
128151
uses: actions/checkout@v4
129152

130153
- name: Setup Python & Poetry Environment
131-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
154+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
132155
with:
133-
python-version: "3.9"
156+
poetry-version: '2.1.2'
134157

135158
- name: Run format check
136-
run: poetry run nox -s project:format
159+
run: poetry run -- nox -s project:format
137160

138161
Tests:
139-
name: Unit-Tests (Python-${{ matrix.python-version }}, Exasol-${{ matrix.exasol-version}})
162+
name: Unit-Tests (Python-${{ matrix.python-version }})
140163
needs: [ Documentation, Lint, Type-Check, Security, Format, build-matrix ]
141-
runs-on: ubuntu-latest
164+
runs-on: ubuntu-24.04
142165
env:
143-
GITHUB_TOKEN: ${{ secrets.ALTERNATIVE_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
166+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144167
strategy:
145168
fail-fast: false
146169
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
@@ -150,15 +173,16 @@ jobs:
150173
uses: actions/checkout@v4
151174

152175
- name: Setup Python & Poetry Environment
153-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
176+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
154177
with:
155178
python-version: ${{ matrix.python-version }}
179+
poetry-version: '2.1.2'
156180

157181
- name: Run Tests and Collect Coverage
158-
run: poetry run nox -s test:unit -- -- --coverage
182+
run: poetry run -- nox -s test:unit -- --coverage
159183

160184
- name: Upload Artifacts
161-
uses: actions/upload-artifact@v4.4.0
185+
uses: actions/upload-artifact@v4.6.2
162186
with:
163187
name: coverage-python${{ matrix.python-version }}-fast
164188
path: .coverage

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
- "gh-pages/*"
88
- "main"
99
- "master"
10-
pull_request:
11-
types: [opened, reopened]
1210
schedule:
1311
# “At 00:00 on every 7th day-of-month from 1 through 31.” (https://crontab.guru)
1412
- cron: "0 0 1/7 * *"

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

Lines changed: 6 additions & 4 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,14 +16,16 @@ jobs:
1616
fetch-depth: 0
1717

1818
- name: Setup Python & Poetry Environment
19-
uses: exasol/python-toolbox/.github/actions/python-environment@0.20.0
19+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
20+
with:
21+
poetry-version: '2.1.2'
2022

2123
- name: Build Documentation
2224
run: |
23-
poetry run nox -s docs:multiversion
25+
poetry run -- nox -s docs:multiversion
2426
2527
- name: Deploy
26-
uses: JamesIves/github-pages-deploy-action@v4.6.0
28+
uses: JamesIves/github-pages-deploy-action@v4.7.3
2729
with:
2830
branch: gh-pages
2931
folder: .html-documentation

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,23 @@ 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/python-environment@0.20.0
20+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
21+
with:
22+
poetry-version: '2.1.2'
2123

2224
- name: Generate matrix
23-
run: poetry run nox -s matrix:all
25+
run: poetry run -- nox -s matrix:all
2426

2527
- id: set-matrix
2628
run: |
27-
echo "matrix=$(poetry run nox -s matrix:all)" >> $GITHUB_OUTPUT
29+
echo "matrix=$(poetry run -- nox -s matrix:all)" >> $GITHUB_OUTPUT
2830
2931
outputs:
3032
matrix: ${{ steps.set-matrix.outputs.matrix }}

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

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,23 @@ 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/python-environment@0.20.0
20+
uses: exasol/python-toolbox/.github/actions/python-environment@1.1.0
21+
with:
22+
poetry-version: '2.1.2'
2123

2224
- name: Generate matrix
23-
run: poetry run nox -s matrix:python
25+
run: poetry run -- nox -s matrix:python
2426

2527
- id: set-matrix
2628
run: |
27-
echo "matrix=$(poetry run nox -s matrix:python)" >> $GITHUB_OUTPUT
29+
echo "matrix=$(poetry run -- nox -s matrix:python)" >> $GITHUB_OUTPUT
2830
2931
outputs:
3032
matrix: ${{ steps.set-matrix.outputs.matrix }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Merge-Gate
22

33
on:
44
workflow_call:
5-
secrets:
6-
ALTERNATIVE_GITHUB_TOKEN:
7-
required: false
85

96
jobs:
107

@@ -19,7 +16,7 @@ jobs:
1916
# This job ensures inputs have been executed successfully.
2017
approve-merge:
2118
name: Allow Merge
22-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-24.04
2320
# If you need additional jobs to be part of the merge gate, add them below
2421
needs: [ fast-checks, slow-checks ]
2522

0 commit comments

Comments
 (0)