Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
785894d
build(deps): bump urllib3 from 1.26.19 to 1.26.20
dependabot[bot] Sep 1, 2024
b0f3674
github actions (deps): bump github/combine-prs from 5.0.0 to 5.2.0
dependabot[bot] Nov 1, 2024
640d364
build(deps-dev): bump types-setuptools
dependabot[bot] Nov 1, 2024
df744f9
Merge dependabot/pip/types-setuptools-75.2.0.20241025 into mesh-2092-…
github-actions[bot] Nov 25, 2024
b44763b
Merge dependabot/github_actions/github/combine-prs-5.2.0 into mesh-20…
github-actions[bot] Nov 25, 2024
b7257fe
Merge dependabot/pip/urllib3-1.26.20 into mesh-2092-dependabot-combined
github-actions[bot] Nov 25, 2024
ec117f1
MESH-2530 Dependency updates
acarriedev Aug 13, 2025
b90ef2d
Merge pull request #94 from NHSDigital/mesh-2530-update-deps
acarriedev Aug 13, 2025
5552f69
MESH-2092 update dependencies
jimasp Sep 29, 2025
2ba2034
Merge pull request #103 from NHSDigital/MESH-2092-update-dependencies
jimasp Sep 29, 2025
a006e27
MESH-2092 merge develop into branch
jimasp Sep 29, 2025
0197994
MESH-2092 bump actions-poetry
jimasp Sep 29, 2025
d99c310
MESH-2092 bump actions/checkout version
jimasp Sep 29, 2025
5dd8378
MESH-2092 Trigger Build
jimasp Sep 30, 2025
c9d117e
MESH-2092 bump tox
jimasp Oct 1, 2025
9ad30eb
MESH-2092 bump pytest
jimasp Oct 1, 2025
839b7a2
MESH-2092 bump types-setuptools
jimasp Oct 1, 2025
71017ad
MESH-2092 bump coverage
jimasp Oct 1, 2025
083d53a
MESH-2092 bump requests package
jimasp Oct 1, 2025
825559b
MESH-2092 poetry update
jimasp Oct 1, 2025
8e95f88
MESH-2092 just a comment
jimasp Oct 1, 2025
edc0e30
MESH-2092 just a comment
jimasp Oct 1, 2025
ffc15c7
MESH-2092 update boto
jimasp Oct 2, 2025
82c4974
MESH-2092 update setup-python
jimasp Oct 2, 2025
af7d225
MESH-2092 bump setup-java version
jimasp Oct 2, 2025
bebafea
MESH-2092 updating comment
jimasp Oct 2, 2025
54c8841
Merge pull request #104 from NHSDigital/mesh-2092-dependabot-combined
jimasp Oct 6, 2025
4530485
Bump tox from 4.28.4 to 4.30.2
dependabot[bot] Oct 6, 2025
3bc2071
Bump boto3 from 1.40.8 to 1.40.43
dependabot[bot] Oct 6, 2025
57362fd
Merge dependabot/pip/boto3-1.40.43 into mesh-2092-dependabot-combined
github-actions[bot] Oct 6, 2025
c48f776
Merge dependabot/pip/tox-4.30.2 into mesh-2092-dependabot-combined
github-actions[bot] Oct 6, 2025
27e846d
MESH-2092 Trigger Build
jimasp Oct 6, 2025
bded7c8
MESH-2092 fix for Sonar rule githubactions:S7630
jimasp Oct 6, 2025
fa6a2e4
MESH-2092 update proxy connect message
jimasp Oct 6, 2025
44dbb93
MESH-2092 proxy connect error - assert on type not message
jimasp Oct 6, 2025
e685e28
MESH-2092 remove old constant
jimasp Oct 6, 2025
70f663d
Merge pull request #112 from NHSDigital/mesh-2092-dependabot-combined
jimasp Oct 6, 2025
db711ab
MESH-2092 Trigger Build
jimasp Oct 6, 2025
1a48a57
MESH-2092 sonar/ruff fixes
jimasp Oct 20, 2025
7079462
MESH-2092 sonar/ruff fixes
jimasp Oct 20, 2025
9bd82cd
Merge pull request #113 from NHSDigital/MESH-2092-test
jimasp Oct 20, 2025
d062949
github actions (deps): bump mikepenz/action-junit-report
dependabot[bot] Nov 1, 2025
4c6a907
github actions (deps): bump actions/upload-artifact from 4 to 5
dependabot[bot] Nov 1, 2025
1cf3a9f
Bump types-six from 1.17.0.20250515 to 1.17.0.20251009
dependabot[bot] Nov 1, 2025
5a9693b
Bump boto3 from 1.40.45 to 1.42.0
dependabot[bot] Dec 1, 2025
6123c3e
Bump werkzeug from 3.1.3 to 3.1.4
dependabot[bot] Dec 1, 2025
1261fec
Bump black from 25.9.0 to 25.11.0
dependabot[bot] Dec 1, 2025
123a7ac
Bump mypy from 1.18.2 to 1.19.0
dependabot[bot] Dec 1, 2025
8a522c8
Merge dependabot/pip/mypy-1.19.0 into mesh-2092-dependabot-combined
github-actions[bot] Dec 17, 2025
0f90097
Merge dependabot/pip/black-25.11.0 into mesh-2092-dependabot-combined
github-actions[bot] Dec 17, 2025
01676ee
Merge dependabot/pip/werkzeug-3.1.4 into mesh-2092-dependabot-combined
github-actions[bot] Dec 17, 2025
de36abf
Merge dependabot/pip/boto3-1.42.0 into mesh-2092-dependabot-combined
github-actions[bot] Dec 17, 2025
617075f
Merge dependabot/pip/types-six-1.17.0.20251009 into mesh-2092-dependa…
github-actions[bot] Dec 17, 2025
ffd4f94
Merge dependabot/github_actions/actions/upload-artifact-5 into mesh-2…
github-actions[bot] Dec 17, 2025
ceff126
Merge branch 'dependabot/github_actions/mikepenz/action-junit-report-…
james-bradley-nhs Dec 17, 2025
da2a74c
mesh-2092: add no redirects
james-bradley-nhs Dec 17, 2025
79b8d2f
mesh-2092: fix gitallowed
james-bradley-nhs Dec 18, 2025
a031c93
Merge pull request #122 from NHSDigital/mesh-2092-dependabot-combined
james-bradley-nhs Dec 18, 2025
0393e72
mesh-2771: dependabot updates, but while still supporting python 3.9
johnwilliams57-nhs Jan 23, 2026
734d904
mesh-2771: removing support for python 3.9
johnwilliams57-nhs Jan 23, 2026
b7a8047
mesh-2771:ruff fixes
johnwilliams57-nhs Jan 23, 2026
c8a10ff
mesh-2771: adding python 3.14 support
johnwilliams57-nhs Jan 23, 2026
23e1730
Merge pull request #131 from NHSDigital/mesh-2771-dependabot
johnwilliams57-nhs Jan 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/merge-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
if: github.repository == 'NHSDigital/mesh-client' && !contains(github.event.head_commit.message, 'tag release version:')
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: 'pyproject.toml'

- name: setup poetry
uses: abatilo/actions-poetry@v3
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
with:
poetry-version: 2.1.3

Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

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

- name: publish junit reports
if: success() || failure()
uses: mikepenz/action-junit-report@v5
uses: mikepenz/action-junit-report@e08919a3b1fb83a78393dfb775a9c37f17d8eea6
with:
check_name: junit reports
report_paths: reports/junit/*.xml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/merge-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: github.repository == 'NHSDigital/mesh-client' && github.actor != 'dependabot[bot]'
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -21,12 +21,12 @@ jobs:
find . -type f | xargs chmod g+w

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: 'pyproject.toml'

- name: setup poetry
uses: abatilo/actions-poetry@v3
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
with:
poetry-version: 2.1.3

Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
tox:
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

runs-on: ubuntu-latest
if: github.repository == 'NHSDigital/mesh-client'
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -35,13 +35,13 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch ${GITHUB_HEAD_REF}"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -64,7 +64,7 @@ jobs:
if: github.repository == 'NHSDigital/mesh-client'
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -87,18 +87,18 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch ${GITHUB_HEAD_REF}"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: 'pyproject.toml'

- name: setup poetry
uses: abatilo/actions-poetry@v3
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
with:
poetry-version: 2.1.3

Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:

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

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

- name: publish junit reports
if: success() || failure()
uses: mikepenz/action-junit-report@v5
uses: mikepenz/action-junit-report@e08919a3b1fb83a78393dfb775a9c37f17d8eea6
with:
check_name: junit reports
report_paths: reports/junit/*.xml
Expand All @@ -190,7 +190,7 @@ jobs:
if: github.repository == 'NHSDigital/mesh-client'
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -205,18 +205,18 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch ${GITHUB_HEAD_REF}"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: 'pyproject.toml'

- name: setup poetry
uses: abatilo/actions-poetry@v3
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
with:
poetry-version: 2.1.3

Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
run: make mypy

- name: shellcheck
uses: ludeeus/action-shellcheck@master
uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38
with:
ignore_paths: .venv build
ignore_names: git-secrets
Expand All @@ -270,7 +270,7 @@ jobs:
- tox
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -290,18 +290,18 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch ${GITHUB_HEAD_REF}"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: 'pyproject.toml'

- name: setup poetry
uses: abatilo/actions-poetry@v3
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
with:
poetry-version: 2.1.3

Expand All @@ -323,7 +323,7 @@ jobs:
ls -l dist

- name: test publish
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
with:
password: ${{ secrets.TEST_PYPI_TOKEN }}
repository-url: https://test.pypi.org/legacy/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-combine-dependabot-prs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v5
uses: github/combine-prs@v5.2.0
with:
ci_required: ${{ inputs.ci_required == 'YES' }}
labels: dependencies
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
poetry 2.1.3
python 3.13.5 3.12.11 3.11.13 3.10.18 3.9.23
python 3.14.1 3.13.5 3.12.11 3.11.13 3.10.18
4 changes: 4 additions & 0 deletions CHANGE-LOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ These are not all encompassing, but we will try and capture noteable differences

----

# 5.0
* drop support for Python 3.9 which is now [EOL](https://devguide.python.org/versions/#status-of-python-versions)
* add support for Python 3.14

# 4.0
* drop support for Python 3.7 and 3.8 which are now [EOL](https://devguide.python.org/versions/#status-of-python-versions)
* add support for Python 3.12 and 3.13
Expand Down
Loading
Loading