From 0fc65bb4ead7bad6f17af136c8f941d010f78ac5 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Mon, 2 Dec 2024 14:06:31 +0000 Subject: [PATCH 1/3] CI: Test with RabbitMQ 4.0.x --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 84ed61712..1309dd468 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -101,7 +101,7 @@ jobs: matrix: # Currently supported RMQ versions per: # https://www.rabbitmq.com/docs/which-erlang#compatibility-matrix - rabbitmq-version: ['3.11', '3.12', '3.13'] + rabbitmq-version: ['3.11', '3.12', '3.13', '4.0'] services: rabbitmq: From 2ba32ab593401cabcc4358bcce6230cc7a3aea6a Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Mon, 2 Dec 2024 14:49:30 +0000 Subject: [PATCH 2/3] Clear warnings from Dockerfile --- .docker/aiida-core-base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/aiida-core-base/Dockerfile b/.docker/aiida-core-base/Dockerfile index 40b18f9fa..591070709 100644 --- a/.docker/aiida-core-base/Dockerfile +++ b/.docker/aiida-core-base/Dockerfile @@ -24,7 +24,7 @@ ENV SYSTEM_USER="${SYSTEM_USER}" # Install all OS dependencies for notebook server that starts but lacks all # features (e.g., download as all possible file formats) -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update --yes && \ # - apt-get upgrade is run to patch known vulnerabilities in apt-get packages as # the ubuntu base image is rebuilt too seldom sometimes (less than once a month) @@ -145,7 +145,7 @@ RUN set -x && \ # Add ~/.local/bin to PATH where the dependencies get installed via pip # This require the package installed with `--user` flag in pip, which we set as default. ENV PATH=${PATH}:/home/${SYSTEM_USER}/.local/bin -ENV PIP_USER 1 +ENV PIP_USER=1 # Switch to root to install AiiDA and set AiiDA as service # Install AiiDA from source code From 32f9229ef8d18ded56a63050413517abd3789768 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 5 Dec 2024 17:34:04 +0000 Subject: [PATCH 3/3] Fix nightly tests --- .github/workflows/nightly.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1309dd468..eb3001987 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -67,13 +67,15 @@ jobs: uses: ./.github/actions/install-aiida-core with: python-version: '3.11' + from-lock: 'true' - name: Setup environment - run: .github/workflows/setup.sh + # NOTE: virtual env in .venv created by uv in previous step + run: source .venv/bin/activate && .github/workflows/setup.sh - name: Run tests id: tests - run: .github/workflows/tests_nightly.sh + run: source .venv/bin/activate && .github/workflows/tests_nightly.sh - name: Slack notification # Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the @@ -118,18 +120,19 @@ jobs: uses: ./.github/actions/install-aiida-core with: python-version: '3.11' + from-lock: 'true' - name: Setup SSH on localhost - run: .github/workflows/setup_ssh.sh + run: source .venv/bin/activate && .github/workflows/setup_ssh.sh - name: Suppress RabbitMQ version warning - run: verdi config set warnings.rabbitmq_version False + run: uv run verdi config set warnings.rabbitmq_version False - name: Run tests id: tests env: AIIDA_WARN_v3: 0 - run: pytest -s --db-backend sqlite -m 'requires_rmq' tests/ + run: uv run pytest -s --db-backend sqlite -m 'requires_rmq' tests/ - name: Slack notification # Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the