Merge pull request #1875 from NHSDigital/develop

APIM-R 1.39 Cut

Author: nhsd-david-wass

.github/workflows/continous-integration-workflow.yaml

@@ -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.8
+      - name: Install Python 3.10
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: Upgrade python packaging tools
         run: python -m pip install --upgrade pip setuptools wheel

README.md

@@ -35,7 +35,7 @@ The contents of this repository are protected by Crown Copyright (C).
 ### Environment setup
 Currently, automation for setting up the right environment is only available for machines based on RedHatEnterpriseLinux (RHEL).
 Running the following will ensure your environment is ready for development.
-It will install [pyenv](https://github.com/pyenv/pyenv), Python 3.8.12 and its dependencies (yum), create a virtual environment (named apigee), and ensure poetry is installed under it.
+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.
 ```
 $ make setup-environment
 ```

azure/azure-build-pipeline.yml

@@ -17,7 +17,7 @@ resources:
     - repository: common
       type: github
       name: NHSDigital/api-management-utils
-      ref: refs/heads/edge
+      ref: refs/heads/master
       endpoint: NHSDigital
 
 variables:
@@ -27,3 +27,4 @@ extends:
   parameters:
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
+    python_version: ${{ variables.python_version }}

azure/azure-pr-pipeline.yml

@@ -8,7 +8,7 @@ resources:
     - repository: common
       type: github
       name: NHSDigital/api-management-utils
-      ref: refs/heads/edge
+      ref: refs/heads/master
       endpoint: NHSDigital
   pipelines:
     - pipeline: build_pipeline
@@ -33,6 +33,7 @@ extends:
     short_service_name: ${{ variables.short_service_name }}
     service_base_path: ${{ variables.service_base_path }}
     manual_approval_env: manual-approval-ptl
+    python_version: ${{ variables.python_version }}
     apigee_deployments:
       - environment: manual-approval
         stage_name: manual_approval_alpha_pr

azure/azure-release-pipeline.yml

@@ -8,7 +8,7 @@ resources:
     - repository: common
       type: github
       name: NHSDigital/api-management-utils
-      ref: refs/heads/edge
+      ref: refs/heads/master
       endpoint: NHSDigital
   pipelines:
     - pipeline: build_pipeline
@@ -33,6 +33,7 @@ extends:
     enable_status_monitoring: true
     manual_approval_env: manual-approval-ptl
     prod_producer_approval: true
+    python_version: ${{ variables.python_version }}
     apigee_deployments:
     - environment: manual-approval
       stage_name: ers_manual_approval_alpha

azure/project.yml

@@ -5,3 +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