From 5fbd57cb583780ee5ee8e74c2ef401fc5ba413be Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Fri, 10 Oct 2025 13:45:06 +0100
Subject: [PATCH 01/16] ci: Added github workflows for automated ci

---
 .github/workflows/ci_linting.yml | 52 ++++++++++++++++++++++++++++++++
 .github/workflows/ci_testing.yml | 51 +++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 .github/workflows/ci_linting.yml
 create mode 100644 .github/workflows/ci_testing.yml

diff --git a/.github/workflows/ci_linting.yml b/.github/workflows/ci_linting.yml
new file mode 100644
index 0000000..15eba82
--- /dev/null
+++ b/.github/workflows/ci_linting.yml
@@ -0,0 +1,52 @@
+name: CI Audit, Formatting & Linting
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7.17"]
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Poetry
+        run: pipx install poetry==2.2.0
+
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+
+      - name: Install lint dependencies
+        run: poetry install --with lint
+
+      # Ignoring pip-audit for now - known vulnerabilities with py 3.7
+      # - name: Install pip-audit
+      #   run: poetry run pip install --force-reinstall pip-audit
+
+      # - name: Run Audit
+      #   run: poetry run pip-audit
+
+      - name: Run isort
+        run: poetry run isort src
+
+      - name: Run mypy
+        run: poetry run mypy src
+
+      - name: Run pylint
+        run: poetry run pylint src
\ No newline at end of file
diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
new file mode 100644
index 0000000..61c117f
--- /dev/null
+++ b/.github/workflows/ci_testing.yml
@@ -0,0 +1,51 @@
+name: CI Unit Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7.17"]
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Poetry
+        run: |
+          pipx install poetry==1.4.2
+
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+
+      - name: Install test dependencies
+        run: |
+          poetry install --with test
+
+      - name: Run unit tests
+        run: make coverage
+      
+      - name: Upload Coverage Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-xml
+          path: coverage.xml
+      
+      - name: Run behave tests
+        run: make behave
\ No newline at end of file

From c6e3385e0752e942e985d74b86a6c78439222d8c Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 11:20:08 +0100
Subject: [PATCH 02/16] ci: tweaks to ci following github testing

---
 .github/workflows/ci_linting.yml | 38 +++++++++++++++----------------
 .github/workflows/ci_testing.yml | 39 ++++++++++++++++----------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/ci_linting.yml b/.github/workflows/ci_linting.yml
index 15eba82..5144c08 100644
--- a/.github/workflows/ci_linting.yml
+++ b/.github/workflows/ci_linting.yml
@@ -6,23 +6,28 @@ on:
     branches:
       - main
 
+
 jobs:
   build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.7.17"]
-
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v5
 
-      - name: Set up ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
+      - name: Install extra dependencies for a python 3.7.17 install
+        run: |
+          sudo apt-get update
+          sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
+
+      - name: Install asdf cli
+        uses: asdf-vm/actions/setup@v4
 
-      - name: Install Poetry
-        run: pipx install poetry==2.2.0
+      - name: Install Python 3.7.17
+        run: |
+          asdf plugin add python
+          asdf install python 3.7.17
+
+      - name: Install Poetry and Java
+        uses: asdf-vm/actions/install@v4
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4
@@ -33,14 +38,9 @@ jobs:
             ${{ runner.os }}-poetry-
 
       - name: Install lint dependencies
-        run: poetry install --with lint
-
-      # Ignoring pip-audit for now - known vulnerabilities with py 3.7
-      # - name: Install pip-audit
-      #   run: poetry run pip install --force-reinstall pip-audit
-
-      # - name: Run Audit
-      #   run: poetry run pip-audit
+        run: |
+          poetry run pip install --upgrade pip 
+          poetry install --with lint
 
       - name: Run isort
         run: poetry run isort src
diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index 61c117f..2f45ddb 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -9,22 +9,25 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.7.17"]
-
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
-
-      - name: Set up ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
+      - name: Checkout code
+        uses: actions/checkout@v5
 
-      - name: Install Poetry
+      - name: Install extra dependencies for a python 3.7.17 install
         run: |
-          pipx install poetry==1.4.2
+          sudo apt-get update
+          sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
+      - name: Install asdf cli
+        uses: asdf-vm/actions/setup@v4
+
+      # - name: Install Python 3.7.17
+      #   run: |
+      #     asdf plugin add python
+      #     asdf install python 3.7.17
+
+      - name: Install Python, Poetry and Java
+        uses: asdf-vm/actions/install@v4
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4
@@ -33,11 +36,9 @@ jobs:
           key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
           restore-keys: |
             ${{ runner.os }}-poetry-
-
       - name: Install test dependencies
         run: |
-          poetry install --with test
-
+          make install-test
       - name: Run unit tests
         run: make coverage
       
@@ -46,6 +47,6 @@ jobs:
         with:
           name: coverage-xml
           path: coverage.xml
-      
-      - name: Run behave tests
-        run: make behave
\ No newline at end of file
+
+      # - name: Run behave tests
+      #   run: make behave
\ No newline at end of file

From 48279cc48c307ff3e5dcec6236dbf7fc697de7d2 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:21:01 +0100
Subject: [PATCH 03/16] ci: tweak make command to install venv. Add in enforced
 python 3.7.17 install as seems to be installing poetry prior to python

---
 .github/workflows/ci_linting.yml |  3 +--
 .github/workflows/ci_testing.yml | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci_linting.yml b/.github/workflows/ci_linting.yml
index 5144c08..a463f95 100644
--- a/.github/workflows/ci_linting.yml
+++ b/.github/workflows/ci_linting.yml
@@ -39,8 +39,7 @@ jobs:
 
       - name: Install lint dependencies
         run: |
-          poetry run pip install --upgrade pip 
-          poetry install --with lint
+          make install
 
       - name: Run isort
         run: poetry run isort src
diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index 2f45ddb..aca3c43 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -21,10 +21,10 @@ jobs:
       - name: Install asdf cli
         uses: asdf-vm/actions/setup@v4
 
-      # - name: Install Python 3.7.17
-      #   run: |
-      #     asdf plugin add python
-      #     asdf install python 3.7.17
+      - name: Install Python 3.7.17
+        run: |
+          asdf plugin add python
+          asdf install python 3.7.17
 
       - name: Install Python, Poetry and Java
         uses: asdf-vm/actions/install@v4
@@ -38,7 +38,7 @@ jobs:
             ${{ runner.os }}-poetry-
       - name: Install test dependencies
         run: |
-          make install-test
+          make install
       - name: Run unit tests
         run: make coverage
       

From 1c6cf70d2179a2c9b47324186fe7502c9ba43805 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:54:55 +0100
Subject: [PATCH 04/16] ci: issues with last build which may be linked to use
 of java 17 rather than java 8. Tweaked workflow to explicitly add java to
 asdf management in attempt to resolve

---
 .github/workflows/ci_testing.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index aca3c43..67937f8 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -25,9 +25,16 @@ jobs:
         run: |
           asdf plugin add python
           asdf install python 3.7.17
+      
+      - name: Install java 
+        run: |
+          asdf plugin add java
+          asdf install java liberica-1.8.0
 
-      - name: Install Python, Poetry and Java
-        uses: asdf-vm/actions/install@v4
+      - name: Install poetry 
+        run: |
+          asdf plugin add poetry
+          asdf install poetry 1.4.2
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4

From 2093115244ed9e93e38a574015d30815c38c2509 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:19:13 +0100
Subject: [PATCH 05/16] ci: added asdf reshim in attempt to ensure correct
 versions of software are used

---
 .github/workflows/ci_testing.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index 67937f8..db2ec21 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -20,21 +20,12 @@ jobs:
           sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
       - name: Install asdf cli
         uses: asdf-vm/actions/setup@v4
-
-      - name: Install Python 3.7.17
-        run: |
-          asdf plugin add python
-          asdf install python 3.7.17
+    
+      - name: Install Python, Poetry and Java
+        uses: asdf-vm/actions/install@v4
       
-      - name: Install java 
-        run: |
-          asdf plugin add java
-          asdf install java liberica-1.8.0
-
-      - name: Install poetry 
-        run: |
-          asdf plugin add poetry
-          asdf install poetry 1.4.2
+      - name: asdf reshim
+        run: asdf reshim
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4

From 5f50edba61d21f09a8c037ef618a79cb7bd7f469 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:48:43 +0100
Subject: [PATCH 06/16] ci: adding some debug as still issues with spark
 session instantiation

---
 .github/workflows/ci_testing.yml | 64 +++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index db2ec21..2d1dcac 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -20,31 +20,59 @@ jobs:
           sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
       - name: Install asdf cli
         uses: asdf-vm/actions/setup@v4
-    
-      - name: Install Python, Poetry and Java
-        uses: asdf-vm/actions/install@v4
+
+      - name: Install Python 3.7.17
+        run: |
+          asdf plugin add python
+          asdf local python 3.7.17
+          asdf install python 3.7.17
+      
+      - name: Install java 
+        run: |
+          asdf plugin add java
+          asdf local java liberica-1.8.0
+          asdf install java liberica-1.8.0
+
+      - name: Install poetry 
+        run: |
+          asdf plugin add poetry
+          asdf local poetry 1.4.2
+          asdf install poetry 1.4.2
       
-      - name: asdf reshim
+      - name: reshim
         run: asdf reshim
+      
+      - name: DEBUG - show versions
+        run: |
+          echo "python version: $(which python)"
+          echo "java version: $(which java)"
+          echo "poetry version: $(which poetry)"
+      
+      - name: DEBUG - cat .tool-versions
+        run: |
+          echo "PWD - $PWD"
+          cat ${PWD}/.tool-versions
+
+      # - name: Cache Poetry virtualenv
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ~/.cache/pypoetry
+      #     key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-poetry-
 
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pypoetry
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-poetry-
       - name: Install test dependencies
         run: |
           make install
-      - name: Run unit tests
-        run: make coverage
+
+      # - name: Run unit tests
+      #   run: make coverage
       
-      - name: Upload Coverage Report
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-xml
-          path: coverage.xml
+      # - name: Upload Coverage Report
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: coverage-xml
+      #     path: coverage.xml
 
       # - name: Run behave tests
       #   run: make behave
\ No newline at end of file

From 468757431c804ac2579b4a27dda79da25beae2af Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:54:31 +0100
Subject: [PATCH 07/16] ci: replaced asdf local with asdf set --local as
 different version being used on runner

---
 .github/workflows/ci_testing.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index 2d1dcac..dc0ef9b 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -24,19 +24,19 @@ jobs:
       - name: Install Python 3.7.17
         run: |
           asdf plugin add python
-          asdf local python 3.7.17
+          asdf set python 3.7.17 --local
           asdf install python 3.7.17
       
       - name: Install java 
         run: |
           asdf plugin add java
-          asdf local java liberica-1.8.0
+          asdf set java liberica-1.8.0 --local
           asdf install java liberica-1.8.0
 
       - name: Install poetry 
         run: |
           asdf plugin add poetry
-          asdf local poetry 1.4.2
+          asdf set poetry 1.4.2 --local
           asdf install poetry 1.4.2
       
       - name: reshim

From aca2d1e0d2506f737da1534d8381c69c3e8d26cb Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 15:02:50 +0100
Subject: [PATCH 08/16] ci: replaced asdf local with asdf set as different
 version being used on runner

---
 .github/workflows/ci_testing.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index dc0ef9b..ce01553 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -24,19 +24,19 @@ jobs:
       - name: Install Python 3.7.17
         run: |
           asdf plugin add python
-          asdf set python 3.7.17 --local
+          asdf set python 3.7.17
           asdf install python 3.7.17
       
       - name: Install java 
         run: |
           asdf plugin add java
-          asdf set java liberica-1.8.0 --local
+          asdf set java liberica-1.8.0
           asdf install java liberica-1.8.0
 
       - name: Install poetry 
         run: |
           asdf plugin add poetry
-          asdf set poetry 1.4.2 --local
+          asdf set poetry 1.4.2
           asdf install poetry 1.4.2
       
       - name: reshim

From d13f07f9f0b650ebbddcf2471e9ec56d357d9275 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 16:51:21 +0100
Subject: [PATCH 09/16] ci: more debugging. Restructured asdf setup approach

---
 .github/workflows/ci_testing.yml | 50 ++++++++++++++------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index ce01553..7f73569 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -21,37 +21,17 @@ jobs:
       - name: Install asdf cli
         uses: asdf-vm/actions/setup@v4
 
-      - name: Install Python 3.7.17
-        run: |
-          asdf plugin add python
-          asdf set python 3.7.17
-          asdf install python 3.7.17
-      
-      - name: Install java 
+      - name: Setup asdf
         run: |
           asdf plugin add java
           asdf set java liberica-1.8.0
-          asdf install java liberica-1.8.0
-
-      - name: Install poetry 
-        run: |
+          asdf plugin add python
+          asdf set python 3.7.17
           asdf plugin add poetry
           asdf set poetry 1.4.2
-          asdf install poetry 1.4.2
-      
-      - name: reshim
-        run: asdf reshim
-      
-      - name: DEBUG - show versions
-        run: |
-          echo "python version: $(which python)"
-          echo "java version: $(which java)"
-          echo "poetry version: $(which poetry)"
-      
-      - name: DEBUG - cat .tool-versions
-        run: |
-          echo "PWD - $PWD"
-          cat ${PWD}/.tool-versions
+          asdf install
+          asdf reshim
+    
 
       # - name: Cache Poetry virtualenv
       #   uses: actions/cache@v4
@@ -64,9 +44,23 @@ jobs:
       - name: Install test dependencies
         run: |
           make install
+      
+      - name: DEBUG - show versions
+        run: |
+          echo "python version: $(which python)"
+          echo "java version: $(which java)"
+          echo "poetry version: $(which poetry)"
+      
+      - name: DEBUG - cat .tool-versions
+        run: |
+          echo "PWD - $PWD"
+          cat ${PWD}/.tool-versions
+      
+      - name: DEBUG - check JAVA_HOME
+        run: echo "JAVA_HOME: $JAVA_HOME"
 
-      # - name: Run unit tests
-      #   run: make coverage
+      - name: Run pytest and behave tests
+        run: make all-tests
       
       # - name: Upload Coverage Report
       #   uses: actions/upload-artifact@v4

From 760a88e1bab40aa5deea425823108293966da007 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 16:52:35 +0100
Subject: [PATCH 10/16] ci: more debugging. Restructured asdf setup approach

---
 .github/workflows/ci_testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index 7f73569..e733b75 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -57,7 +57,7 @@ jobs:
           cat ${PWD}/.tool-versions
       
       - name: DEBUG - check JAVA_HOME
-        run: echo "JAVA_HOME: $JAVA_HOME"
+        run: echo "JAVA_HOME - $JAVA_HOME"
 
       - name: Run pytest and behave tests
         run: make all-tests

From 7ab1d9d1f9c295f209b0aa8aa26799219e51de1c Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 19:13:53 +0100
Subject: [PATCH 11/16] ci: more debugging. export JAVA_HOME to allow correct
 spark session config for test step

---
 .github/workflows/ci_testing.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index e733b75..5857de4 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -55,12 +55,12 @@ jobs:
         run: |
           echo "PWD - $PWD"
           cat ${PWD}/.tool-versions
-      
-      - name: DEBUG - check JAVA_HOME
-        run: echo "JAVA_HOME - $JAVA_HOME"
 
       - name: Run pytest and behave tests
-        run: make all-tests
+        run: |
+          export JAVA_HOME=$(asdf where java)
+          echo "JAVA_HOME - $JAVA_HOME"
+          make all-tests
       
       # - name: Upload Coverage Report
       #   uses: actions/upload-artifact@v4

From 57c59e1dbce4b13f84a494ae20bc2ca4819c00de Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 20:54:43 +0100
Subject: [PATCH 12/16] ci: removed debugging and reenabled skipped steps

---
 .github/workflows/ci_testing.yml | 47 +++++++++++++-------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index 5857de4..b055ab3 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -32,41 +32,32 @@ jobs:
           asdf install
           asdf reshim
     
-
-      # - name: Cache Poetry virtualenv
-      #   uses: actions/cache@v4
-      #   with:
-      #     path: ~/.cache/pypoetry
-      #     key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-poetry-
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
 
       - name: Install test dependencies
         run: |
           make install
-      
-      - name: DEBUG - show versions
-        run: |
-          echo "python version: $(which python)"
-          echo "java version: $(which java)"
-          echo "poetry version: $(which poetry)"
-      
-      - name: DEBUG - cat .tool-versions
-        run: |
-          echo "PWD - $PWD"
-          cat ${PWD}/.tool-versions
 
-      - name: Run pytest and behave tests
+      - name: Run pytest and coverage
         run: |
           export JAVA_HOME=$(asdf where java)
           echo "JAVA_HOME - $JAVA_HOME"
-          make all-tests
+          make coverage
       
-      # - name: Upload Coverage Report
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: coverage-xml
-      #     path: coverage.xml
+      - name: Upload Coverage Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-xml
+          path: coverage.xml
 
-      # - name: Run behave tests
-      #   run: make behave
\ No newline at end of file
+      - name: Run behave tests
+        run: |
+          export JAVA_HOME=$(asdf where java)
+          echo "JAVA_HOME - $JAVA_HOME"
+          make behave
\ No newline at end of file

From e8eaf4f912d5045bf66bca43e8108e733813b4aa Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 21:14:22 +0100
Subject: [PATCH 13/16] ci: attempt to run asdf install straight from
 .tool-versions

---
 .github/workflows/ci_testing.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index b055ab3..cef6f24 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -23,12 +23,6 @@ jobs:
 
       - name: Setup asdf
         run: |
-          asdf plugin add java
-          asdf set java liberica-1.8.0
-          asdf plugin add python
-          asdf set python 3.7.17
-          asdf plugin add poetry
-          asdf set poetry 1.4.2
           asdf install
           asdf reshim
     

From 0eb46bd39a34c99ecf99c85d5325ea3741f3b296 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 21:16:52 +0100
Subject: [PATCH 14/16] ci: attempt to run asdf install straight from
 .tool-versions

---
 .github/workflows/ci_testing.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml
index cef6f24..24fa5fc 100644
--- a/.github/workflows/ci_testing.yml
+++ b/.github/workflows/ci_testing.yml
@@ -21,10 +21,11 @@ jobs:
       - name: Install asdf cli
         uses: asdf-vm/actions/setup@v4
 
-      - name: Setup asdf
-        run: |
-          asdf install
-          asdf reshim
+      - name: Install software through asdf
+        uses: asdf-vm/actions/install@v4
+      
+      - name: reshim asdf
+        run: asdf reshim
     
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4

From f9410f229cdc75b7383a4195b31240c3fce10997 Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 21:47:14 +0100
Subject: [PATCH 15/16] ci: use .tool-versions for asdf installs in linting and
 reshim prior to running of linting

---
 .github/workflows/ci_linting.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci_linting.yml b/.github/workflows/ci_linting.yml
index a463f95..f5d4a9c 100644
--- a/.github/workflows/ci_linting.yml
+++ b/.github/workflows/ci_linting.yml
@@ -21,13 +21,11 @@ jobs:
       - name: Install asdf cli
         uses: asdf-vm/actions/setup@v4
 
-      - name: Install Python 3.7.17
-        run: |
-          asdf plugin add python
-          asdf install python 3.7.17
-
-      - name: Install Poetry and Java
+      - name: Install software through asdf
         uses: asdf-vm/actions/install@v4
+      
+      - name: reshim asdf
+        run: asdf reshim
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4

From 270b2040ca5cb6af3b74fe3d9384f227a0065a5f Mon Sep 17 00:00:00 2001
From: stevenhsd <56357022+stevenhsd@users.noreply.github.com>
Date: Mon, 13 Oct 2025 22:02:40 +0100
Subject: [PATCH 16/16] ci: added black back into linting

---
 .github/workflows/ci_linting.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci_linting.yml b/.github/workflows/ci_linting.yml
index f5d4a9c..c7e57fa 100644
--- a/.github/workflows/ci_linting.yml
+++ b/.github/workflows/ci_linting.yml
@@ -1,4 +1,4 @@
-name: CI Audit, Formatting & Linting
+name: CI Formatting & Linting
 
 on:
   pull_request:
@@ -38,6 +38,9 @@ jobs:
       - name: Install lint dependencies
         run: |
           make install
+      
+      - name: Run black
+        run: poetry run black src
 
       - name: Run isort
         run: poetry run isort src