Merge branch 'master' into enhancement/option-to-save-tx-cbor

Author: ladamesny

.github/actions/tests/run-e2e-tests/action.yml

@@ -104,13 +104,13 @@ runs:
           echo "Running tests via docker exec"
           docker exec tests bash -c "
             cd /e2e-tests &&
-            source venv/bin/activate &&
+            source .venv/bin/activate &&
             $pytest_cmd
           "
         else
           echo "Running tests locally"
           cd e2e-tests
-          source venv/bin/activate
+          source .venv/bin/activate
           eval "$pytest_cmd"
         fi
       env:

.github/actions/tests/setup-python/action.yml

@@ -19,8 +19,5 @@ runs:
       run: |
         cd e2e-tests
         curl -L --silent https://github.com/getsops/sops/releases/download/v3.7.3/sops_3.7.3_amd64.deb > sops.deb && sudo dpkg -i sops.deb && rm sops.deb
-        python -m venv venv
-        source venv/bin/activate
-        pip install -r requirements.txt
-        cd ..
+        nix develop
       shell: bash

dev/local-environment/configurations/tests/entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ex  # Exit on any error, print commands
 
 # Verify the e2e-tests directory exists and cd into it
 if [ -d "/e2e-tests" ]; then
@@ -26,11 +27,17 @@ rm /tmp/sops.deb
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 
-# 5) Create and initialize the virtual environment
-python -m venv venv
-source venv/bin/activate
-pip install --upgrade pip
-pip install -r requirements.txt
+# 5) Install uv and sync dependencies
+curl -LsSf https://astral.sh/uv/install.sh | sh
+export PATH="/root/.local/bin:$PATH"
+echo "uv version: $(uv --version)"
+echo "Creating virtual environment with uv sync..."
+uv sync --verbose
+echo "Virtual environment created at: $(pwd)/.venv"
+ls -la .venv/bin/
+
+set +x  # Stop printing commands
+echo "===== Environment setup complete ====="
 
 # Keep the container running
 tail -f /dev/null

e2e-tests/Earthfile

@@ -2,7 +2,8 @@ VERSION 0.7
 FROM python:3.12
 WORKDIR /test
 
-COPY --dir ./config ./secrets ./tests ./src ./requirements.txt ./pytest.ini ./tox.ini .
+COPY --dir ./config ./secrets ./tests ./src ./pytest.ini ./tox.ini .
+COPY pyproject.toml uv.lock .
 
 ARG AWS_DEFAULT_REGION=eu-central-1
 ARG blockchain=substrate
@@ -47,7 +48,9 @@ build:
   RUN kubectl config set-context my-context --cluster=my-cluster --user=github-actions --namespace=default
   RUN kubectl config use-context my-context
   RUN curl -L --silent https://github.com/getsops/sops/releases/download/v3.7.3/sops_3.7.3_${USERARCH}.deb > sops.deb && dpkg -i sops.deb && rm sops.deb
-  RUN pip install -r requirements.txt
+  RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+  ENV PATH="/root/.local/bin:$PATH"
+  RUN uv sync
 
 test:
   # ATTENTION! +test target saves exit code to a file and returns success even when tests fail.
@@ -56,9 +59,9 @@ test:
   FROM +build
   ARG CI_RUN
   IF [ "$CI_RUN" = "true" ]
-    RUN --secret AWS_SECRET_ACCESS_KEY --secret AWS_ACCESS_KEY_ID --secret AWS_SESSION_TOKEN --no-cache eval $pytest_cmd --ci-run || true
+    RUN --secret AWS_SECRET_ACCESS_KEY --secret AWS_ACCESS_KEY_ID --secret AWS_SESSION_TOKEN --no-cache source .venv/bin/activate && eval $pytest_cmd --ci-run || true
   ELSE
-    RUN --mount=type=secret,target=/root/.aws/credentials,id=aws --mount=type=secret,target=/root/.kube/config,id=kube --no-cache eval $pytest_cmd || true
+    RUN --mount=type=secret,target=/root/.aws/credentials,id=aws --mount=type=secret,target=/root/.kube/config,id=kube --no-cache source .venv/bin/activate && eval $pytest_cmd || true
   END
 
 test-artifacts: