diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d36174eb..72bef06a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -59,4 +59,4 @@ jobs: - name: Integration tests # Unfortunate workaround required until we have better test/settings isolation - run: pytest --cov=jobflow_remote --cov-report=xml tests/integration + run: pytest -vv tests/integration diff --git a/tests/integration/dockerfiles/Dockerfile.slurm b/tests/integration/dockerfiles/Dockerfile.slurm index baed322f..fb320d20 100644 --- a/tests/integration/dockerfiles/Dockerfile.slurm +++ b/tests/integration/dockerfiles/Dockerfile.slurm @@ -26,11 +26,6 @@ WORKDIR /home/${USERNAME} USER ${USERNAME} SHELL ["/bin/bash", "--login", "-c"] -# Install micromamba to manage Python environments -RUN curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba -RUN micromamba shell init --shell bash --root-prefix ~/micromamba -RUN micromamba create --yes -n jobflow python=3.10 -c conda-forge - # Install jobflow from directory, assuming container # is built at the root of the jobflow repo RUN mkdir jobflow-remote @@ -46,9 +41,12 @@ USER root RUN sudo chmod -R 0777 jobflow-remote USER ${USERNAME} +# Install jobflow in a local native virtualenv WORKDIR /home/${USERNAME}/jobflow-remote RUN git config --global --add safe.directory /home/${USERNAME}/jobflow-remote -RUN micromamba run -n jobflow pip install -e . +RUN python3 -m venv /home/${USERNAME}/.venv +RUN /home/${USERNAME}/.venv/bin/pip install -U pip +RUN /home/${USERNAME}/.venv/bin/pip install --verbose -e . # Make a job directory for jobflow WORKDIR /home/${USERNAME}