Skip to content

Commit d516b07

Browse files
authored
DS-939 Upgrading python version from 3.12 to 3.14 (#1136)
# Task Branch Pull Request **<https://nhsd-jira.digital.nhs.uk/browse/DS-939>** ## Description of Changes This PR includes upgrade of terraform for core and provider version. It also includes upgrade of python version from 3.12 to 3.14 ## Type of change Delete not appropriate - Bug fix (Dependabot recommended upgrade for terraform and python version in the DI) ## Development Checklist - [x] I have performed a self-review of my own code - [x] Tests have added that prove my fix is effective or that my feature works (Integration tests) - [x] I have updated Dependabot to include my changes (if applicable) ## Code Reviewer Checklist - [x] I can confirm the changes have been tested or approved by a tester
1 parent 75fb469 commit d516b07

7 files changed

Lines changed: 19 additions & 12 deletions

File tree

.github/workflows/code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
-Dsonar.projectKey=nhsdigital_dos-integration
3939
-Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
4040
-Dsonar.python.coverage.reportPaths=coverage.xml
41-
-Dsonar.python.version=3.12
41+
-Dsonar.python.version=3.14
4242
-Dsonar.exclusions=application/**/tests/**
4343
4444
check-markdown-code-quality:

.github/workflows/configs/vale/styles/config/vocabularies/words/accept.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CodePipeline
2121
Xcode
2222
Tunnelblick
2323
// Environments
24-
dev
24+
[Dd]ev
2525
perf
2626
perf2
2727
nonprod
@@ -32,14 +32,20 @@ mgmt
3232
MGMT
3333
// Development/Deployment Terms
3434
adhoc
35+
rebase
36+
pytest
3537
healthcheck
36-
runbook
37-
Runbook
38+
[Rr]unbooks?
39+
Allowlist
40+
slack_and_infrastructure
41+
opening_times
42+
hotfixes
43+
automations
3844
undeploy
3945
Undeploy
46+
undeployed
4047
Onboarding
4148
onboarding
4249
// Miscellaneous
4350
bbbbbb
4451
gggggg
45-
[A-Z]+s

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The main components you will need for _basic_ development work, are your OS vers
100100

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

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

483483
### Remove deployment with commit tag
484484

485-
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
485+
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
486486

487487
make tag-commit-to-destroy-environment ENVIRONMENT=[environment to destroy] COMMIT=[short commit hash]
488488
e.g. make tag-commit-to-destroy-environment ENVIRONMENT=ds-363 COMMIT=2bc43dd // This destroys the ds-363 dev environment

build/docker/lambda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/python:3.12-arm64
1+
FROM public.ecr.aws/lambda/python:3.14-arm64
22
# Update Pip
33
RUN python -m pip install --upgrade pip
44
# Copy Python requirements

build/docker/tester/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12
1+
FROM python:3.14
22
# Update Pip
33
RUN python -m pip install --upgrade pip
44
# Copy Python requirements

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ line-length = 120
135135
# Allow unused variables when underscore-prefixed.
136136
lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
137137

138-
# Set target version to Python 3.12.
138+
# Set target version to Python 3.14.
139139
target-version = "py312"
140140

141141
[tool.ruff.lint.per-file-ignores]

test/pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ lint.ignore = [
1515
"DTZ007", # the use of `datetime.datetime.strptime()` without %z must be followed by `.replace(tzinfo=)` or `.astimezone()`
1616
]
1717

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

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

0 commit comments

Comments
 (0)