Skip to content

[RAA-3605]-[KM]-[upgrade lxml, pytest-nhsd-apim, python + codeownders]-[BS] #2667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
balalsaleh-nhs wants to merge 1 commit into
base: develop
Choose a base branch
from
+353 −399
Open

[RAA-3605]-[KM]-[upgrade lxml, pytest-nhsd-apim, python + codeownders]-[BS] #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

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

/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/package.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @balalsaleh-nhs
4 changes: 2 additions & 2 deletions .github/workflows/continous-integration-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
with:
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function

- name: Install Python 3.10
- name: Install Python 3.13
uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.13'

- name: Upgrade python packaging tools
run: python -m pip install --upgrade pip setuptools wheel
Expand Down
8 changes: 8 additions & 0 deletions azure/azure-build-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ resources:

variables:
- template: project.yml

jobs:
- job: SetupPython
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: ${{ variables.python_version }}

extends:
template: azure/common/apigee-build.yml@common
parameters:
Expand Down
2 changes: 1 addition & 1 deletion azure/project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ variables:
product_display_name: e-Referrals-Service
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
spec_file: e-referrals-service-api.json
python_version: 3.10
python_version: 3.13
662 changes: 304 additions & 358 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[project]
python = "^3.8"
python = "^3.10"
name = "e-referrals-service-api"
version = "0.0.1-alpha"
description = "TODO"
Expand All @@ -20,13 +20,13 @@ package-mode = false


[tool.poetry.dependencies]
python = "^3.10"
python = "^3.13"
pyyaml = "^6.0"
docopt = "^0.6.2"
jsonpath-rw = "^1.4.0"
semver = "^3.0.4"
gitpython = "^3.1.45"
lxml = "^4.9.4"
lxml = "^5.1.0"
xmlformatter = "^0.2.8"
pytest-check = "^2.6.0"
requests = "^2.32.5"
Expand All @@ -40,7 +40,7 @@ pip-licenses = "^5.5.0"
jinja2 = "^3.1.6"
pytest = "^8.4.2"
pytest-asyncio = "^1.3.0"
pytest-nhsd-apim = "^4.0.1"
pytest-nhsd-apim = "^5.0.6"

[tool.poetry.scripts]

Expand Down
26 changes: 13 additions & 13 deletions scripts/macos_setup_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,29 +45,29 @@ else
exit 2
fi

# Installing python 3.10.8 with pyenv
echo "Installing python 3.10.8 with pyenv ..."
if pyenv versions | grep -Fq "3.10.8" ; then
echo "Pyenv has already got Python 3.10.8 installed."
# Installing python 3.13 with pyenv
echo "Installing python 3.13 with pyenv ..."
if pyenv versions | grep -Fq "3.13" ; then
echo "Pyenv has already got Python 3.13 installed."
else
if pyenv install 3.10.8 ; then
echo "Pyenv installed Python 3.10.8 successfully."
if pyenv install 3.13 ; then
echo "Pyenv installed Python 3.13 successfully."
else
echo "Pyenv did NOT install Python 3.10.8 successfully."
echo "Pyenv did NOT install Python 3.13 successfully."
exit 3
fi
fi


# Creating Apigee environment with Python 3.10.8
echo "Creating Apigee environment with Python 3.10.8 ..."
# Creating Apigee environment with Python 3.13
echo "Creating Apigee environment with Python 3.13 ..."
if pyenv versions | grep -q ".*apigee" ; then
echo "A Python virtualenv named 'apigee' already exists."
else
if pyenv virtualenv 3.10.8 apigee ; then
echo "A Python 3.10.8 virtualenv named 'apigee' was created."
if pyenv virtualenv 3.13 apigee ; then
echo "A Python 3.13 virtualenv named 'apigee' was created."
else
echo "A Python 3.10.8 virtualenv named 'apigee' was NOT created."
echo "A Python 3.13 virtualenv named 'apigee' was NOT created."
exit 4
fi
fi
Expand All @@ -86,7 +86,7 @@ fi
# Checking python version
echo "Checking python version ..."
version=$(python -V 2>&1)
if [[ $version = 'Python 3.10.8' ]] ; then
if [[ $version = 'Python 3.13'* ]] ; then
echo "Python version is correct."
else
echo "Python version is NOT correct."
Expand Down
26 changes: 13 additions & 13 deletions scripts/ubuntu_setup_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,29 @@ else
fi


#Installing python 3.10.8 with pyenv
echo "Installing python 3.10.8 with pyenv ..."
if pyenv versions | grep -Fq "3.10.8" ; then
echo "Pyenv has already got Python 3.10.8 installed."
#Installing python 3.13 with pyenv
echo "Installing python 3.13 with pyenv ..."
if pyenv versions | grep -Fq "3.13" ; then
echo "Pyenv has already got Python 3.13 installed."
else
if pyenv install 3.10.8 ; then
echo "Pyenv installed Python 3.10.8 successfully."
if pyenv install 3.13 ; then
echo "Pyenv installed Python 3.13 successfully."
else
echo "Pyenv did NOT install Python 3.10.8 successfully."
echo "Pyenv did NOT install Python 3.13 successfully."
exit 1
fi
fi


#Creating Apigee environment with Python 3.10.8
echo "Creating Apigee environment with Python 3.10.8 ..."
#Creating Apigee environment with Python 3.13
echo "Creating Apigee environment with Python 3.13 ..."
if pyenv versions | grep -q ".*apigee" ; then
echo "A Python virtualenv named 'apigee' already exists."
else
if pyenv virtualenv 3.10.8 apigee ; then
echo "A Python 3.10.8 virtualenv named 'apigee' was created."
if pyenv virtualenv 3.13 apigee ; then
echo "A Python 3.13 virtualenv named 'apigee' was created."
else
echo "A Python 3.10.8 virtualenv named 'apigee' was NOT created."
echo "A Python 3.13 virtualenv named 'apigee' was NOT created."
exit 1
fi
fi
Expand All @@ -104,7 +104,7 @@ fi
#Checking python version
echo "Checking python version ..."
version=$(python -V 2>&1)
if [[ $version = 'Python 3.10.8' ]] ; then
if [[ $version = 'Python 3.13'* ]] ; then
echo "Python version is correct."
else
echo "Python version is NOT correct."
Expand Down