From a268a1c19bb6bbd7583a3e13334d6c28b4b38e99 Mon Sep 17 00:00:00 2001
From: jameshod5 <james.hodson@ukaea.uk>
Date: Fri, 17 May 2024 11:03:07 +0100
Subject: [PATCH] run ci

---
 .github/workflows/ci.yml  | 9 +++++----
 dev/docker/api.Dockerfile | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f84d9b..08d80f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,9 +27,6 @@ jobs:
 
     - name: Build and run containers
       run: |
-        pip install uv
-        uv venv venv
-        source venv/bin/activate
         docker-compose \
         --env-file dev/docker/.env.dev \
         -f dev/docker/docker-compose.yml \
@@ -41,11 +38,15 @@ jobs:
       run: |
         git lfs fetch
         git lfs pull
+        pip install uv
+        uv venv venv
+        source venv/bin/activate
+        uv pip install -r requirements.txt
 
     - name: Run tests
       run: |
         source venv/bin/activate
-        python -m pytest -rsx tests/test_json.py --data-path=/home/runner/work/fair-mast/fair-mast/tests/mock_data/mini
+        python -m pytest -rsx tests/ --data-path=/home/runner/work/fair-mast/fair-mast/tests/mock_data/mini
 
 
 
diff --git a/dev/docker/api.Dockerfile b/dev/docker/api.Dockerfile
index d6725c7..7b75099 100644
--- a/dev/docker/api.Dockerfile
+++ b/dev/docker/api.Dockerfile
@@ -3,7 +3,7 @@ WORKDIR /code
 
 COPY ./requirements.txt /code/requirements.txt
 
-RUN uv pip install --no-cache-dir --upgrade -r /code/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
 COPY ./src /code/src