Skip to content

Commit 67c6c70

Browse files
Merge branch 'master' into FLAGSAPI-820-uplift-github-actions-cache-to-v4
2 parents d4330f0 + d9b8eb0 commit 67c6c70

6 files changed

Lines changed: 1075 additions & 739 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ guard-%:
99
install: install-node install-python install-hooks
1010

1111
install-python:
12-
poetry install
12+
poetry install --no-root
1313

1414
install-node:
1515
npm install
@@ -79,4 +79,4 @@ smoketest: pytest-guards
7979
poetry run python -m pytest -v --junitxml=smoketest-report.xml -s -m smoketest
8080

8181
prod-smoketest: pytest-guards
82-
poetry run python -m pytest -v --junitxml=smoketest-report.xml -s -m prodsmoketest
82+
poetry run python -m pytest -v --junitxml=smoketest-report.xml -s -m prodsmoketest

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ name = "pypi"
88
[dev-packages]
99

1010
[requires]
11-
python_version = "3.8"
11+
python_version = "3.9"

azure/azure-build-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ variables:
2626
extends:
2727
template: azure/common/apigee-build.yml@common
2828
parameters:
29+
python_version: 3.9
2930
service_name: ${{ variables.service_name }}
3031
short_service_name: ${{ variables.short_service_name }}
3132

azure/azure-pr-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ variables:
2929
extends:
3030
template: azure/common/apigee-deployment.yml@common
3131
parameters:
32+
python_version: 3.9
3233
service_name: ${{ variables.service_name }}
3334
service_base_path: ${{ variables.service_base_path }}
3435
short_service_name: ${{ variables.short_service_name }}

collection/postman_collection.json

Lines changed: 1064 additions & 725 deletions
Large diffs are not rendered by default.

pyproject.toml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22
python = "^3.10"
33
name = "summary-care-record-api"
44

5+
56
[tool.poetry]
67
name = "summary-care-record-api"
7-
version = "0.0.1-alpha"
8-
package-mode = false
9-
description = "TODO"
8+
version = "3.0.5-alpha"
9+
description = "NHS Hosted adaptor to convert HL7 based patient Summary Care Records into JSON FHIR, and vice-versa."
1010

1111
license = "MIT"
1212

13-
authors = [
14-
#TODO add authors
15-
]
13+
authors = []
1614

1715
readme = 'README.md'
1816

1917
repository = "https://github.com/NHSDigital/summary-care-record-api"
2018

21-
keywords = ["healthcare", "uk", "nhs"] #TODO add additional keywords
22-
19+
keywords = ["healthcare", "uk", "nhs"]
2320

2421
[tool.poetry.dependencies]
2522
certifi = ">=2024.7.4"
@@ -32,14 +29,13 @@ locust = "^1.2"
3229
polling2 = "^0.4.7"
3330
pytest-bdd = "^4.0.1"
3431
pytest-rerunfailures = "^9.1.1"
35-
python = "^3.8"
32+
python = "^3.10"
3633
python-dateutil = "^2.8.1"
3734
pyyaml = "^6.0.2"
3835
requests = "^2.32.3"
3936
semver = "^2.10.2"
4037
werkzeug = "3.0.3"
4138

42-
4339
[tool.poetry.dev-dependencies]
4440
flake8 = "^3.8.3"
4541
black = "^24.3.0"
@@ -50,5 +46,4 @@ pyjwt = "^2.0.1"
5046
pytest-rerunfailures = "9.1.1"
5147
pip-licenses = "^3.5.3"
5248

53-
5449
[tool.poetry.scripts]

0 commit comments

Comments
 (0)