Skip to content

MESH-2092 Combined Dependabot PRs #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimasp merged 22 commits into from
Oct 6, 2025
Merged

MESH-2092 Combined Dependabot PRs #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 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
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
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
8 changes: 4 additions & 4 deletions .github/workflows/merge-develop.yml
View file
Open in desktop
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@v4
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 Down
6 changes: 3 additions & 3 deletions .github/workflows/merge-release.yml
View file
Open in desktop
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@v4
with:
poetry-version: 2.1.3

Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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 @@ -41,7 +41,7 @@ jobs:
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 Down Expand Up @@ -93,12 +93,12 @@ jobs:
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@v4
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 Down Expand Up @@ -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 @@ -211,12 +211,12 @@ jobs:
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@v4
with:
poetry-version: 2.1.3

Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
- tox
steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -296,12 +296,12 @@ jobs:
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@v4
with:
poetry-version: 2.1.3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-combine-dependabot-prs.yaml
View file
Open in desktop
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.1.0
uses: github/combine-prs@v5.2.0
with:
ci_required: ${{ inputs.ci_required == 'YES' }}
labels: dependencies
Expand Down
2 changes: 1 addition & 1 deletion mesh_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ def __init__(self, msg_id: str, response, client):
header_value = header_value.upper() in ["Y", "TRUE"]

setattr(self, attribute, header_value)
chunk, chunk_count = map(int, headers.get("Mex-Chunk-Range", "1:1").split(":"))
_chunk, chunk_count = map(int, headers.get("Mex-Chunk-Range", "1:1").split(":"))
Copy link
Copy Markdown
Contributor

@jimasp jimasp Oct 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i prefixed var name with "_" to keep ruff happy with an unused var


if not hasattr(self, "content_type") or not self.content_type: # type: ignore[has-type]
# try and get content_type from Mex-Content-Type first, but fallback to request content type if not set
Expand Down
Loading
Loading