Skip to content

Commit 6ec85af

Browse files
Updated poetry lock to fix conflict
2 parents 8e30c51 + 1b7a6e1 commit 6ec85af

41 files changed

Lines changed: 4371 additions & 4112 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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 @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
13+
/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
14+
/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
15+
/package.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
16+
/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
17+
/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
18+
/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2
19+
/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @EdwardWills-nhs @georgeCraftReferrals @csaw-nhs @petkopetkov2

.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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The contents of this repository are protected by Crown Copyright (C).
3535
### Environment setup
3636
Currently, automation for setting up the right environment is only available for machines based on RedHatEnterpriseLinux (RHEL).
3737
Running the following will ensure your environment is ready for development.
38-
It will install [pyenv](https://github.com/pyenv/pyenv), Python 3.10.8 and its dependencies (yum), create a virtual environment (named apigee), and ensure poetry is installed under it.
38+
It will install [pyenv](https://github.com/pyenv/pyenv), Python 3.13 and its dependencies (yum), create a virtual environment (named apigee), and ensure poetry is installed under it.
3939
```
4040
$ make setup-environment
4141
```

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.13

0 commit comments

Comments
 (0)