From 9e043fd5e6033459c4446ad157136f9006c07b96 Mon Sep 17 00:00:00 2001
From: James Adams <james.adams@stfc.ac.uk>
Date: Thu, 31 Jul 2025 11:15:24 +0100
Subject: [PATCH] Switch to using a virtualenv for tests

This means we run in a cleaner environment with less potential for conflicts with system python packages.
Use "safe" runner temp directory for the virtualenv.
Call jobs something more meaningful than "build".
---
 .github/workflows/pylint.yml | 13 +++++++------
 .github/workflows/pytest.yml | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index 311ba32..22993b9 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -3,7 +3,7 @@ name: Lint
 on: [push, pull_request]
 
 jobs:
-  build:
+  pylint:
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.container-image }}
@@ -16,12 +16,13 @@ jobs:
         fetch-depth: 0
     - name: Install Python
       run: |
-        dnf install -y python3 python3-pip findutils
+        dnf install -y python3 findutils
     - name: Install dependencies
       run: |
-        python3 -m pip install --upgrade pip
-        pip3 install -r requirements.txt
-        pip3 install -r test_requirements.txt
+        python3 -m venv "$RUNNER_TEMP/venv"
+        "$RUNNER_TEMP/venv/bin/pip" install --upgrade pip
+        "$RUNNER_TEMP/venv/bin/pip" install -r requirements.txt
+        "$RUNNER_TEMP/venv/bin/pip" install -r test_requirements.txt
     - name: Analysing any changed code with pylint
       run: |
-        find . -type f -name '*.py' | xargs -r pylint --max-line-length=120
+        find . -type f -name '*.py' | xargs -r "$RUNNER_TEMP/venv/bin/pylint" --max-line-length=120
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 251055b..de3429e 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -3,7 +3,7 @@ name: Unit Tests
 on: [push, pull_request]
 
 jobs:
-  build:
+  pytest:
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.container-image }}
@@ -16,12 +16,13 @@ jobs:
         fetch-depth: 0
     - name: Install Python
       run: |
-        dnf install -y python3 python3-pip
+        dnf install -y python3
     - name: Install dependencies
       run: |
-        python3 -m pip install --upgrade pip
-        pip3 install -r requirements.txt
-        pip3 install -r test_requirements.txt
+        python3 -m venv "$RUNNER_TEMP/venv"
+        "$RUNNER_TEMP/venv/bin/pip" install --upgrade pip
+        "$RUNNER_TEMP/venv/bin/pip" install -r requirements.txt
+        "$RUNNER_TEMP/venv/bin/pip" install -r test_requirements.txt
     - name: Running unit tests with pytest
       run: |
-        cd aquilon/ && pytest -vv
+        cd aquilon/ && "$RUNNER_TEMP/venv/bin/pytest" -vv