From d1a66c14ae454975e19ce77d1f059f400f60f7bf Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Fri, 14 Mar 2025 09:51:59 +0000
Subject: [PATCH 1/2] Testing a resolution for pipeline failure seen with using
 python v3.10

---
 .azure/azure-ci-build-pipeline.yaml | 62 ++++++++++++++---------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml
index b6f24777..8e1b0bca 100644
--- a/.azure/azure-ci-build-pipeline.yaml
+++ b/.azure/azure-ci-build-pipeline.yaml
@@ -14,41 +14,41 @@ parameters:
   - name: matrix
     type: object
     default:
-    - job_name: 'UbuntuPython39'
-      py: '3.9'
-      img: 'ubuntu-latest'
-      every_time: false
-      publish_coverage: false
+    # - job_name: 'UbuntuPython39'
+    #   py: '3.9'
+    #   img: 'ubuntu-latest'
+    #   every_time: false
+    #   publish_coverage: false
     - job_name: 'UbuntuPython310'
-      py: '3.10'
+      py: 'v3.10'
       img: 'ubuntu-latest'
       every_time: true
       publish_coverage: true
-    - job_name: 'UbuntuPython311'
-      py: '3.11'
-      img: 'ubuntu-latest'
-      every_time: false
-      publish_coverage: false
-    - job_name: 'WindowsPython39'
-      py: '3.9'
-      img: 'windows-latest'
-      every_time: false
-      publish_coverage: false
-    - job_name: 'WindowsPython311'
-      py: '3.11'
-      img: 'windows-latest'
-      every_time: false
-      publish_coverage: false
-    - job_name: 'MacOSPython39'
-      py: '3.9'
-      img: 'macOS-latest'
-      every_time: false
-      publish_coverage: false
-    - job_name: 'MacOSPython311'
-      py: '3.11'
-      img: 'macOS-latest'
-      every_time: false
-      publish_coverage: false
+    # - job_name: 'UbuntuPython311'
+    #   py: '3.11'
+    #   img: 'ubuntu-latest'
+    #   every_time: false
+    #   publish_coverage: false
+    # - job_name: 'WindowsPython39'
+    #   py: '3.9'
+    #   img: 'windows-latest'
+    #   every_time: false
+    #   publish_coverage: false
+    # - job_name: 'WindowsPython311'
+    #   py: '3.11'
+    #   img: 'windows-latest'
+    #   every_time: false
+    #   publish_coverage: false
+    # - job_name: 'MacOSPython39'
+    #   py: '3.9'
+    #   img: 'macOS-latest'
+    #   every_time: false
+    #   publish_coverage: false
+    # - job_name: 'MacOSPython311'
+    #   py: '3.11'
+    #   img: 'macOS-latest'
+    #   every_time: false
+    #   publish_coverage: false
 
 stages:
   - stage: Test

From cd2da383bf212b9b9d246f2fe02538ff3dbe339d Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Fri, 14 Mar 2025 09:59:58 +0000
Subject: [PATCH 2/2] Standardise how python version is declared in ADO
 pipelines to prevent python version weirdness

---
 .azure/azure-ci-build-pipeline.yaml | 60 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml
index 8e1b0bca..4353b082 100644
--- a/.azure/azure-ci-build-pipeline.yaml
+++ b/.azure/azure-ci-build-pipeline.yaml
@@ -14,41 +14,41 @@ parameters:
   - name: matrix
     type: object
     default:
-    # - job_name: 'UbuntuPython39'
-    #   py: '3.9'
-    #   img: 'ubuntu-latest'
-    #   every_time: false
-    #   publish_coverage: false
+    - job_name: 'UbuntuPython39'
+      py: 'v3.9'
+      img: 'ubuntu-latest'
+      every_time: false
+      publish_coverage: false
     - job_name: 'UbuntuPython310'
       py: 'v3.10'
       img: 'ubuntu-latest'
       every_time: true
       publish_coverage: true
-    # - job_name: 'UbuntuPython311'
-    #   py: '3.11'
-    #   img: 'ubuntu-latest'
-    #   every_time: false
-    #   publish_coverage: false
-    # - job_name: 'WindowsPython39'
-    #   py: '3.9'
-    #   img: 'windows-latest'
-    #   every_time: false
-    #   publish_coverage: false
-    # - job_name: 'WindowsPython311'
-    #   py: '3.11'
-    #   img: 'windows-latest'
-    #   every_time: false
-    #   publish_coverage: false
-    # - job_name: 'MacOSPython39'
-    #   py: '3.9'
-    #   img: 'macOS-latest'
-    #   every_time: false
-    #   publish_coverage: false
-    # - job_name: 'MacOSPython311'
-    #   py: '3.11'
-    #   img: 'macOS-latest'
-    #   every_time: false
-    #   publish_coverage: false
+    - job_name: 'UbuntuPython311'
+      py: 'v3.11'
+      img: 'ubuntu-latest'
+      every_time: false
+      publish_coverage: false
+    - job_name: 'WindowsPython39'
+      py: 'v3.9'
+      img: 'windows-latest'
+      every_time: false
+      publish_coverage: false
+    - job_name: 'WindowsPython311'
+      py: 'v3.11'
+      img: 'windows-latest'
+      every_time: false
+      publish_coverage: false
+    - job_name: 'MacOSPython39'
+      py: 'v3.9'
+      img: 'macOS-latest'
+      every_time: false
+      publish_coverage: false
+    - job_name: 'MacOSPython311'
+      py: 'v3.11'
+      img: 'macOS-latest'
+      every_time: false
+      publish_coverage: false
 
 stages:
   - stage: Test