Skip to content

Commit a9ca8b1

Browse files
balalsaleh-nhsbalalsaleh-nhs
committed
[RAA-3605]-[KM]-[upgrade lxml, pytest-nhsd-apim, python + codeownders]-[BS]
1 parent c5173ae commit a9ca8b1

8 files changed

Lines changed: 346 additions & 397 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
# For version files that are updated by dependabot we have a cut down list
1111

12-
/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
13-
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
14-
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
15-
/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
16-
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
17-
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
18-
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
19-
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
12+
/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
13+
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
14+
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
15+
/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
16+
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
17+
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
18+
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
19+
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs

‎.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.12
1616
uses: actions/setup-python@v6
1717
with:
18-
python-version: '3.10'
18+
python-version: '3.12'
1919

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

‎azure/azure-build-pipeline.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ resources:
2222

2323
variables:
2424
- template: project.yml
25+
2526
extends:
2627
template: azure/common/apigee-build.yml@common
2728
parameters:

‎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.12

‎poetry.lock‎

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

‎pyproject.toml‎

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

2121

2222
[tool.poetry.dependencies]
23-
python = "^3.10"
23+
python = "^3.12"
2424
pyyaml = "^6.0"
2525
docopt = "^0.6.2"
2626
jsonpath-rw = "^1.4.0"
2727
semver = "^3.0.4"
2828
gitpython = "^3.1.45"
29-
lxml = "^4.9.4"
29+
lxml = "^5.1.0"
3030
xmlformatter = "^0.2.8"
3131
pytest-check = "^2.6.0"
3232
requests = "^2.32.5"
@@ -40,7 +40,7 @@ pip-licenses = "^5.5.0"
4040
jinja2 = "^3.1.6"
4141
pytest = "^8.4.2"
4242
pytest-asyncio = "^1.3.0"
43-
pytest-nhsd-apim = "^4.0.1"
43+
pytest-nhsd-apim = "^5.0.6"
4444

4545
[tool.poetry.scripts]
4646

‎scripts/macos_setup_environment.sh‎

Lines changed: 13 additions & 13 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.8 with pyenv
49-
echo "Installing python 3.10.8 with pyenv ..."
50-
if pyenv versions | grep -Fq "3.10.8" ; then
51-
echo "Pyenv has already got Python 3.10.8 installed."
48+
# Installing python 3.12 with pyenv
49+
echo "Installing python 3.12 with pyenv ..."
50+
if pyenv versions | grep -Fq "3.12" ; then
51+
echo "Pyenv has already got Python 3.12 installed."
5252
else
53-
if pyenv install 3.10.8 ; then
54-
echo "Pyenv installed Python 3.10.8 successfully."
53+
if pyenv install 3.12 ; then
54+
echo "Pyenv installed Python 3.12 successfully."
5555
else
56-
echo "Pyenv did NOT install Python 3.10.8 successfully."
56+
echo "Pyenv did NOT install Python 3.12 successfully."
5757
exit 3
5858
fi
5959
fi
6060

6161

62-
# Creating Apigee environment with Python 3.10.8
63-
echo "Creating Apigee environment with Python 3.10.8 ..."
62+
# Creating Apigee environment with Python 3.12
63+
echo "Creating Apigee environment with Python 3.12 ..."
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.8 apigee ; then
68-
echo "A Python 3.10.8 virtualenv named 'apigee' was created."
67+
if pyenv virtualenv 3.12 apigee ; then
68+
echo "A Python 3.12 virtualenv named 'apigee' was created."
6969
else
70-
echo "A Python 3.10.8 virtualenv named 'apigee' was NOT created."
70+
echo "A Python 3.12 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.8' ]] ; then
89+
if [[ $version = 'Python 3.12'* ]] ; 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.8 with pyenv
67-
echo "Installing python 3.10.8 with pyenv ..."
68-
if pyenv versions | grep -Fq "3.10.8" ; then
69-
echo "Pyenv has already got Python 3.10.8 installed."
66+
#Installing python 3.12 with pyenv
67+
echo "Installing python 3.12 with pyenv ..."
68+
if pyenv versions | grep -Fq "3.12" ; then
69+
echo "Pyenv has already got Python 3.12 installed."
7070
else
71-
if pyenv install 3.10.8 ; then
72-
echo "Pyenv installed Python 3.10.8 successfully."
71+
if pyenv install 3.12 ; then
72+
echo "Pyenv installed Python 3.12 successfully."
7373
else
74-
echo "Pyenv did NOT install Python 3.10.8 successfully."
74+
echo "Pyenv did NOT install Python 3.12 successfully."
7575
exit 1
7676
fi
7777
fi
7878

7979

80-
#Creating Apigee environment with Python 3.10.8
81-
echo "Creating Apigee environment with Python 3.10.8 ..."
80+
#Creating Apigee environment with Python 3.12
81+
echo "Creating Apigee environment with Python 3.12 ..."
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.8 apigee ; then
86-
echo "A Python 3.10.8 virtualenv named 'apigee' was created."
85+
if pyenv virtualenv 3.12 apigee ; then
86+
echo "A Python 3.12 virtualenv named 'apigee' was created."
8787
else
88-
echo "A Python 3.10.8 virtualenv named 'apigee' was NOT created."
88+
echo "A Python 3.12 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.8' ]] ; then
107+
if [[ $version = 'Python 3.12'* ]] ; then
108108
echo "Python version is correct."
109109
else
110110
echo "Python version is NOT correct."

0 commit comments

Comments
 (0)