From 634fffdb9eb2a2b1e47b82dd003cfc8c19727a02 Mon Sep 17 00:00:00 2001 From: Edd Almond Date: Thu, 17 Jul 2025 14:56:28 +0100 Subject: [PATCH 1/6] adding poetry set up --- .github/workflows/publish_sandbox.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish_sandbox.yaml b/.github/workflows/publish_sandbox.yaml index ec89ba3..70ab344 100644 --- a/.github/workflows/publish_sandbox.yaml +++ b/.github/workflows/publish_sandbox.yaml @@ -27,6 +27,9 @@ jobs: with: node-version: '20' + - name: Install Poetry + run: curl -sSL https://install.python-poetry.org | python3 - + - name: Install Python and Node dependencies run: | make install From 71357aed8ff71cd04ad96cc857b66d3dbac11d83 Mon Sep 17 00:00:00 2001 From: Edd Almond Date: Thu, 17 Jul 2025 14:58:59 +0100 Subject: [PATCH 2/6] bumping python to 3.11 to aid in compatability --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4bf51ad..933028c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = [ #TODO add authors ] readme = "README.md" -requires-python = ">=3.13" +requires-python = ">=3.11" repository = "https://github.com/NHSDigital/eligibility-signposting-api-specification" homepage = "https://digital.nhs.uk/developer/api-catalogue" keywords = ["healthcare", "uk", "nhs", "vaccination", "api"] #TODO add additional keywords @@ -17,7 +17,7 @@ requires = ["poetry-core>=2.0.0,<3.0.0"] build-backend = "poetry.core.masonry.api" [tool.poetry.dependencies] -python = "^3.13" +python = "^3.11" yq = "^3.2.3" [tool.poetry.group.dev.dependencies] From 897ac7069e3b3bd271cbe85347e807e0e4f2c67f Mon Sep 17 00:00:00 2001 From: Edd Almond Date: Thu, 17 Jul 2025 15:01:29 +0100 Subject: [PATCH 3/6] amending lock file for poetry --- poetry.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1df05aa..70826e0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -373,5 +373,5 @@ tests = ["build", "coverage", "mypy", "ruff", "wheel"] [metadata] lock-version = "2.1" -python-versions = "^3.13" -content-hash = "23d89ff43dd8ce7166b9ce17305f7e9cc23e7f0953ce28cd5b35554cdbd12c1e" +python-versions = "^3.11" +content-hash = "52cd7c345199cdfd491fd8551655783c3cfec79ce8d61d07189cf12d71dcff84" From 48446d031c6a1f96eb6e20fdf2005e3ad096ea12 Mon Sep 17 00:00:00 2001 From: Edd Almond Date: Thu, 17 Jul 2025 15:03:47 +0100 Subject: [PATCH 4/6] splitting out make hooks --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ecff3ac..6efdecf 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,9 @@ install-node: npm install --legacy-peer-deps #Condensed Target to run all targets above. -install: install-node install-python .git/hooks/pre-commit +install: install-node install-python + +make-hooks: .git/hooks/pre-commit #Run the npm linting script (specified in package.json). Used to check the syntax and formatting of files. lint: From adb75e329390672cb8deca16d37fb5cb687ede94 Mon Sep 17 00:00:00 2001 From: Edd Almond Date: Thu, 17 Jul 2025 15:12:02 +0100 Subject: [PATCH 5/6] adding --no-confirm --- .github/workflows/publish_sandbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_sandbox.yaml b/.github/workflows/publish_sandbox.yaml index 70ab344..d607a54 100644 --- a/.github/workflows/publish_sandbox.yaml +++ b/.github/workflows/publish_sandbox.yaml @@ -53,7 +53,7 @@ jobs: - name: Deploy sandbox spec to Proxygen run: | - proxygen instance deploy sandbox eligibility-signposting-api build/specification/sandbox/eligibility-signposting-api.yaml + proxygen instance deploy sandbox eligibility-signposting-api build/specification/sandbox/eligibility-signposting-api.yaml --no-confirm - name: Build and publish sandbox Docker image run: | From 21e6ad3a98b4749fc3fceaef42e881f196078e3a Mon Sep 17 00:00:00 2001 From: Edd Almond Date: Thu, 17 Jul 2025 15:19:02 +0100 Subject: [PATCH 6/6] adding make command to build and publish sandbox --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 6efdecf..eb55436 100644 --- a/Makefile +++ b/Makefile @@ -158,6 +158,11 @@ convert-postman: # Create Postman collection from OAS spec portman -l /app/eligibility-signposting-api.yaml -o /app/postman/collection.json echo >> $(POSTMAN_DIR)/collection.json rm $(POSTMAN_DIR)/eligibility-signposting-api.yaml + +build-and-publish-sandbox-image: # Build and publish the sandbox Docker image + $(MAKE) -C sandbox build-and-publish-sandbox-image + + # ============================================================================== ${VERBOSE}.SILENT: \