NPA-6798: Resolve Dependabot issues in validated-relationships-service-api repo#349
Open
davesmallnhs wants to merge 3 commits into
Open
NPA-6798: Resolve Dependabot issues in validated-relationships-service-api repo#349davesmallnhs wants to merge 3 commits into
davesmallnhs wants to merge 3 commits into
Conversation
|
This branch is work on a ticket in the NHS Digital NPA JIRA Project. Here's a handy link to the ticket: NPA-6798 |
|
This branch is work on a ticket in the NHS Digital NPA JIRA Project. Here's a handy link to the ticket: NPA-6798 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request
🧾 Ticket Link
https://nhsd-jira.digital.nhs.uk/browse/NPA-6978
📄 Description/Summary of Changes
There are 14 Dependabot branches/PRs up to 14/05/2026. Most of these are small package updates.
Analysis:
-----8<-----8<-----8<-----8<-----8<-----
The 14 Dependabot branches break down into three categories:
pyproject.toml + lock file (direct dep bumps, 3 PRs):
Lock file only (transitive dep bumps, 10 PRs):
GitHub Actions YAML only (1 PR):
So the practical plan is: apply the 3 pyproject.toml edits, regenerate all lock files fresh (which picks up all transitive updates in one shot), cherry-pick #345, then commit and push.
-----8<-----8<-----8<-----8<-----8<-----
Steps:
pyproject.tomlandsandbox/pyproject.toml-- poetry lock
-- cd sandbox && poetry lock && cd ..
-- cd scripts && poetry lock && cd ..
-- npm update follow-redirects basic-ftp fast-uri
-- git cherry-pick origin/dependabot/github_actions/github-dependencies-0645f932cc
pytest-nhsd-apim: upgraded from^5.0.0to^6.0.0Outcome is 'better than Dependabot':
Package | Dependabot suggested | Now in lock
black (root + sandbox) | 26.3.1 | 26.3.1 ✅
pytest (sandbox) | 9.0.3 | 9.0.3 ✅
python-dotenv | 1.2.2 | 1.2.2 ✅
lxml | 6.1.0 | 6.1.0 ✅
urllib3 | 2.7.0 | 2.7.0 ✅
requests | 2.33.0 | 2.34.2 ⬆️ newer
authlib | 1.6.12 | 1.7.2 ⬆️ newer
cryptography | 46.0.7 | 48.0.0 ⬆️ newer
follow-redirects | 1.16.0 | 1.16.0 ✅
basic-ftp | 5.3.1 | 5.3.1 ✅
fast-uri | 3.1.2 | 3.1.2 ✅
🧪 Developer Testing Carried Out
make generate-postman-collectionregeneratespostman/validated_relationship_service.sandbox.postman_collection.jsonwith only the UUIDs changed.make test-postman-collection SANDBOX_BASE_URL=https://sandbox.api.service.nhs.uk/validated-relationships/FHIR/R4: all tests pass📋 PR Principles
🏷️ Naming Conventions Reminder
Please ensure the following naming conventions are followed:
NPA-XXXX: <short-description><type>/NPA-XXXX/<short-description>NPA-XXXX: <short-description>