Skip to content

Commit e1479a3

Browse files
EdwardWills-nhsEdwardWills-nhs
authored
Merge branch 'develop' into dependabot/npm_and_yarn/undici-6.23.0
2 parents 245c0ec + a14c426 commit e1479a3

9 files changed

Lines changed: 59 additions & 135 deletions

File tree

‎.github/workflows/continous-integration-workflow.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
with:
1313
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function
1414

15-
- name: Install Python 3.10
15+
- name: Install Python 3.13
1616
uses: actions/setup-python@v6
1717
with:
18-
python-version: '3.10'
18+
python-version: '3.13'
1919

2020
- name: Upgrade python packaging tools
2121
run: python -m pip install --upgrade pip setuptools wheel

‎azure/project.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ variables:
55
product_display_name: e-Referrals-Service
66
product_description: The NHS e-RS vision is to enable local innovation and adoption of paperless referrals. To support this vision NHS Digital have created a set of APIs which provide a well-defined, simple to use data interface to the NHS e-Referral Service (e-RS). See https://digital.nhs.uk/developer/api-catalogue/e-referral-service-fhir
77
spec_file: e-referrals-service-api.json
8-
python_version: 3.10
8+
python_version: 3.13

‎poetry.lock‎

Lines changed: 4 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
python = "^3.10"
2+
python = "^3.13"
33
name = "e-referrals-service-api"
44
version = "0.0.1-alpha"
55
description = "TODO"
@@ -20,7 +20,7 @@ package-mode = false
2020

2121

2222
[tool.poetry.dependencies]
23-
python = "^3.10"
23+
python = "^3.13"
2424
pyyaml = "^6.0"
2525
docopt = "^0.6.2"
2626
jsonpath-rw = "^1.4.0"

‎sandbox/src/mocks/stu3/retrieveAdviceAndGuidanceWorklist/responses/AdviceAndGuidanceRequests.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@
9191
}
9292
]
9393
}
94+
},
95+
{
96+
"url": "communicationRequestVersion",
97+
"valueInteger": 10
9498
}
9599
],
96100
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-AdviceAndGuidanceRequests-WorkListItem-1"
@@ -183,6 +187,10 @@
183187
}
184188
]
185189
}
190+
},
191+
{
192+
"url": "communicationRequestVersion",
193+
"valueInteger": 10
186194
}
187195
],
188196
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-AdviceAndGuidanceRequests-WorkListItem-1"

‎scripts/macos_setup_environment.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,29 @@ else
4545
exit 2
4646
fi
4747

48-
# Installing python 3.10 with pyenv
49-
echo "Installing python 3.10 with pyenv ..."
50-
if pyenv versions | grep -Fq "3.10" ; then
51-
echo "Pyenv has already got Python 3.10 installed."
48+
# Installing python 3.13 with pyenv
49+
echo "Installing python 3.13 with pyenv ..."
50+
if pyenv versions | grep -Fq "3.13" ; then
51+
echo "Pyenv has already got Python 3.13 installed."
5252
else
5353
if pyenv install 3.10 ; then
54-
echo "Pyenv installed Python 3.10 successfully."
54+
echo "Pyenv installed Python 3.13 successfully."
5555
else
56-
echo "Pyenv did NOT install Python 3.10 successfully."
56+
echo "Pyenv did NOT install Python 3.13 successfully."
5757
exit 3
5858
fi
5959
fi
6060

6161

62-
# Creating Apigee environment with Python 3.10
63-
echo "Creating Apigee environment with Python 3.10 ..."
62+
# Creating Apigee environment with Python 3.13
63+
echo "Creating Apigee environment with Python 3.13 ..."
6464
if pyenv versions | grep -q ".*apigee" ; then
6565
echo "A Python virtualenv named 'apigee' already exists."
6666
else
67-
if pyenv virtualenv 3.10 apigee ; then
68-
echo "A Python 3.10 virtualenv named 'apigee' was created."
67+
if pyenv virtualenv 3.13 apigee ; then
68+
echo "A Python 3.13 virtualenv named 'apigee' was created."
6969
else
70-
echo "A Python 3.10 virtualenv named 'apigee' was NOT created."
70+
echo "A Python 3.13 virtualenv named 'apigee' was NOT created."
7171
exit 4
7272
fi
7373
fi
@@ -86,7 +86,7 @@ fi
8686
# Checking python version
8787
echo "Checking python version ..."
8888
version=$(python -V 2>&1)
89-
if [[ $version = 'Python 3.10'* ]] ; then
89+
if [[ $version = 'Python 3.13'* ]] ; then
9090
echo "Python version is correct."
9191
else
9292
echo "Python version is NOT correct."

‎scripts/ubuntu_setup_environment.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,29 @@ else
6363
fi
6464

6565

66-
#Installing python 3.10 with pyenv
67-
echo "Installing python 3.10 with pyenv ..."
68-
if pyenv versions | grep -Fq "3.10" ; then
69-
echo "Pyenv has already got Python 3.10 installed."
66+
#Installing python 3.13 with pyenv
67+
echo "Installing python 3.13 with pyenv ..."
68+
if pyenv versions | grep -Fq "3.13" ; then
69+
echo "Pyenv has already got Python 3.13 installed."
7070
else
71-
if pyenv install 3.10 ; then
72-
echo "Pyenv installed Python 3.10 successfully."
71+
if pyenv install 3.13 ; then
72+
echo "Pyenv installed Python 3.13 successfully."
7373
else
74-
echo "Pyenv did NOT install Python 3.10 successfully."
74+
echo "Pyenv did NOT install Python 3.13 successfully."
7575
exit 1
7676
fi
7777
fi
7878

7979

80-
#Creating Apigee environment with Python 3.10
81-
echo "Creating Apigee environment with Python 3.10 ..."
80+
#Creating Apigee environment with Python 3.13
81+
echo "Creating Apigee environment with Python 3.13 ..."
8282
if pyenv versions | grep -q ".*apigee" ; then
8383
echo "A Python virtualenv named 'apigee' already exists."
8484
else
85-
if pyenv virtualenv 3.10 apigee ; then
86-
echo "A Python 3.10 virtualenv named 'apigee' was created."
85+
if pyenv virtualenv 3.13 apigee ; then
86+
echo "A Python 3.13 virtualenv named 'apigee' was created."
8787
else
88-
echo "A Python 3.10 virtualenv named 'apigee' was NOT created."
88+
echo "A Python 3.13 virtualenv named 'apigee' was NOT created."
8989
exit 1
9090
fi
9191
fi
@@ -104,7 +104,7 @@ fi
104104
#Checking python version
105105
echo "Checking python version ..."
106106
version=$(python -V 2>&1)
107-
if [[ $version = 'Python 3.10'* ]] ; then
107+
if [[ $version = 'Python 3.13'* ]] ; then
108108
echo "Python version is correct."
109109
else
110110
echo "Python version is NOT correct."

‎specification/components/stu3/schemas/eRS-FetchWorklist-List.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ properties:
598598
| `referrer` | `1..1` | |
599599
| `service` | `1..1` | |
600600
| `clinicType` | `0..1` | |
601+
| `communicationRequestVersion` | `1..1` | |
601602
items:
602603
anyOf:
603604
- $ref: './extensions/worklists/Extension-WorklistItem-Priority.yaml'
@@ -693,6 +694,20 @@ properties:
693694
- $ref: './extensions/worklists/Extension-WorklistItem-Referrer.yaml'
694695
- $ref: './extensions/worklists/Extension-WorklistItem-Service.yaml'
695696
- $ref: './extensions/worklists/Extension-WorklistItem-ClinicType.yaml'
697+
- title: communicationRequestVersion
698+
type: object
699+
required:
700+
- url
701+
- valueInteger
702+
properties:
703+
url:
704+
type: string
705+
enum:
706+
- communicationRequestVersion
707+
example: 'communicationRequestVersion'
708+
valueInteger:
709+
type: integer
710+
example: 0
696711
- title: Extension-eRS-RejectedTriageResponse-WorkListItem
697712
type: object
698713
required:

‎specification/components/stu3/schemas/endpoints/a023-retrieve-a&g-worklist.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ description: |
88
or to undertake an action, in order to avoid delays to patient care.
99
1010
Service provider organisations can retrieve the contents of their 'Advice and guidance requests' worklist using
11-
this endpoint. This worklist contains advice and guidance requests the provider has received and which need actioning.
11+
this endpoint. This worklist contains advice and guidance requests the provider has received and which need actioning. The version of each advice
12+
request in the worklist will also be returned. Note that the version can change due to admin/clinical changes as well as internal e-RS processes.
1213
1314
There are currently no advice and guidance related worklists available for referring organisations.
1415

0 commit comments

Comments
 (0)