Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
-Dsonar.projectKey=nhsdigital_dos-integration
-Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
-Dsonar.python.coverage.reportPaths=coverage.xml
-Dsonar.python.version=3.12
-Dsonar.python.version=3.14
-Dsonar.exclusions=application/**/tests/**

check-markdown-code-quality:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CodePipeline
Xcode
Tunnelblick
// Environments
dev
[Dd]ev
perf
perf2
nonprod
Expand All @@ -32,14 +32,20 @@ mgmt
MGMT
// Development/Deployment Terms
adhoc
rebase
pytest
healthcheck
runbook
Runbook
[Rr]unbooks?
Allowlist
slack_and_infrastructure
opening_times
hotfixes
automations
undeploy
Undeploy
undeployed
Onboarding
onboarding
// Miscellaneous
bbbbbb
gggggg
[A-Z]+s
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ The main components you will need for _basic_ development work, are your OS vers

- A VPN Client (OpenVPN or Tunnelblick are 2 NHS Digital suggested options)
- Git
- Python (The project currently runs on 3.12)
- Python (The project currently runs on Python 3.14)
- AWS CLI
- Docker/Podman

Expand Down Expand Up @@ -482,7 +482,7 @@ To quick update the lambdas run the following command. Note this only updates th

### Remove deployment with commit tag

You can remove a dev deployment using a single command to create a tag which then runs an AWS CodeBuild project that will remove that environment
You can remove a dev deployment using a single command to create a tag which then starts an AWS CodeBuild project that will remove that environment

make tag-commit-to-destroy-environment ENVIRONMENT=[environment to destroy] COMMIT=[short commit hash]
e.g. make tag-commit-to-destroy-environment ENVIRONMENT=ds-363 COMMIT=2bc43dd // This destroys the ds-363 dev environment
Expand Down
2 changes: 1 addition & 1 deletion build/docker/lambda/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/lambda/python:3.12-arm64
FROM public.ecr.aws/lambda/python:3.14-arm64
# Update Pip
RUN python -m pip install --upgrade pip
# Copy Python requirements
Expand Down
2 changes: 1 addition & 1 deletion build/docker/tester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12
FROM python:3.14
# Update Pip
RUN python -m pip install --upgrade pip
# Copy Python requirements
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ line-length = 120
# Allow unused variables when underscore-prefixed.
lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

# Set target version to Python 3.12.
# Set target version to Python 3.14.
target-version = "py312"

[tool.ruff.lint.per-file-ignores]
Expand Down
5 changes: 3 additions & 2 deletions test/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ lint.ignore = [
"DTZ007", # the use of `datetime.datetime.strptime()` without %z must be followed by `.replace(tzinfo=)` or `.astimezone()`
]

# Set python version to 3.12.
target-version = "py312"
# Ruff currently supports up to Python 3.13; use py313 as target until py314 is released upstream.
# (Runtime may be 3.14; this setting only affects linting's syntax features.)
target-version = "py313"

[tool.ruff.lint.per-file-ignores]
"**test_*.py" = ["S101"] # Allow `assert` in tests.
Expand Down
Loading