FLAGSAPI-1449 uplift python to 3.13

.github/workflows/build.yaml

@@ -13,25 +13,39 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'zulu' # Alternative distribution options are available
+
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.4.2
+
+      - name: Generate wrapper
+        working-directory: docker/service
+        run: gradle wrapper --gradle-version 7.4.2
+
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
+
       - name: Build and analyze
+        working-directory: docker/service
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: cd docker/service && gradle wrapper --gradle-version 7.4.2 && ./gradlew build sonar --info  # Gradle version needed
+        run: ./gradlew build sonar --info

.github/workflows/continuous-integration.yml

@@ -10,12 +10,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
+          fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function
 
-      - name: Install Python 3.9
+      - name: Install Python 3.13
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.13
 
       - name: Update apt repositories
         run: sudo apt update

.gitignore

@@ -13,3 +13,4 @@ __pycache__/
 .venv/
 smoketest-report.xml
 *.code-workspace
+.vscode/

.python-version

@@ -0,0 +1 @@
+3.13.2

Pipfile

@@ -8,4 +8,4 @@ name = "pypi"
 [dev-packages]
 
 [requires]
-python_version = "3.9"
+python_version = "3.13"

README.md

@@ -31,7 +31,7 @@ The current release is version 3.0 stable.
 ### Requirements
 * make
 * nodejs + npm/yarn
-* [poetry](https://github.com/python-poetry/poetry)
+* [poetry version 2.1.2](https://github.com/python-poetry/poetry)
 * Java 8+
 
 ### Install

azure/azure-build-pipeline.yml

@@ -10,7 +10,7 @@ trigger:
 
 pr:
   branches:
-    include: ['*']
+    include: ["*"]
 
 resources:
   repositories:
@@ -26,7 +26,7 @@ variables:
 extends:
   template: azure/common/apigee-build.yml@common
   parameters:
-    python_version: 3.9
+    python_version: 3.13
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
 

azure/azure-pr-pipeline.yml

@@ -21,15 +21,15 @@ resources:
           - refs/tags/v*
 
 pool:
-  name: 'AWS-ECS'
+  name: "AWS-ECS"
 
 variables:
   - template: project.yml
 
 extends:
   template: azure/common/apigee-deployment.yml@common
   parameters:
-    python_version: 3.9
+    python_version: 3.13
     service_name: ${{ variables.service_name }}
     service_base_path: ${{ variables.service_base_path }}
     short_service_name: ${{ variables.short_service_name }}

azure/templates/run-tests-int.yml

@@ -7,7 +7,7 @@ parameters:
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: "3.9"
+      versionSpec: "3.13"
 
   - task: s3-cache-action@1
     inputs:

azure/templates/run-tests-prod.yml

@@ -1,7 +1,7 @@
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: "3.9"
+      versionSpec: "3.13"
 
   - task: s3-cache-action@1
     inputs:

azure/templates/run-tests.yml

@@ -7,7 +7,7 @@ parameters:
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: "3.9"
+      versionSpec: "3.13"
 
   - task: s3-cache-action@1
     inputs:

docker/sds-api/integration-tests/Pipfile

@@ -10,7 +10,7 @@ requests = "*"
 unittest-xml-reporting = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.13"
 
 [scripts]
 inttests = 'python -m xmlrunner discover -o test-reports ./tests'

pyproject.toml

@@ -1,22 +1,16 @@
 [project]
-python = "^3.9"
-name = "summary-care-record-api"
-
-
-[tool.poetry]
+python = "^3.13"
 name = "summary-care-record-api"
 version = "3.0.5-alpha"
 description = "NHS Hosted adaptor to convert HL7 based patient Summary Care Records into JSON FHIR, and vice-versa."
-
+readme = 'README.md'
 license = "MIT"
-
 authors = []
+keywords = ["healthcare", "uk", "nhs"]
 
-readme = 'README.md'
-
-repository = "https://github.com/NHSDigital/summary-care-record-api"
+[project.urls]
+"repository" = "https://github.com/NHSDigital/summary-care-record-api"
 
-keywords = ["healthcare", "uk", "nhs"]
 
 [tool.poetry.dependencies]
 certifi = ">=2024.7.4"
@@ -29,15 +23,15 @@ locust = "^1.2"
 polling2 = "^0.4.7"
 pytest-bdd = "^4.0.1"
 pytest-rerunfailures = "^9.1.1"
-python = "^3.9"
+python = "^3.13"
 python-dateutil = "^2.8.1"
-pyyaml = "^5.2"
+pyyaml = "^6.0"
 requests = "^2.32.3"
 semver = "^2.10.2"
 werkzeug = "3.0.3"
 
-[tool.poetry.dev-dependencies]
-flake8 = "^3.8.3"
+[tool.poetry.group.dev.dependencies]
+flake8 = "^6.1.0"
 black = "^24.3.0"
 jinja2 = "^3.1.4"
 pytest = "^7.2.0"