From df4bb5a27e30442df54c9153ff27c412f8c59ca2 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Wed, 20 Mar 2024 17:27:00 +0000 Subject: [PATCH] Remove qe build (#438) This was moved to aiidalab-qe repository. --- build.json | 6 ------ docker-bake.hcl | 25 +------------------------ tests/conftest.py | 5 ----- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/build.json b/build.json index 5657520d..bb45ad92 100644 --- a/build.json +++ b/build.json @@ -14,12 +14,6 @@ }, "AIIDALAB_HOME_VERSION": { "default": "23.03.1" - }, - "AIIDALAB_QE_VERSION": { - "default": "23.04.6" - }, - "QE_VERSION": { - "default": "7.2" } } } diff --git a/docker-bake.hcl b/docker-bake.hcl index a01ecd6a..b9a204de 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -17,12 +17,6 @@ variable "AIIDALAB_VERSION" { variable "AIIDALAB_HOME_VERSION" { } -variable "AIIDALAB_QE_VERSION" { -} - -variable "QE_VERSION" { -} - variable "JUPYTER_BASE_IMAGE" { default = "jupyter/minimal-notebook:python-${PYTHON_VERSION}" } @@ -40,7 +34,7 @@ variable "PLATFORMS" { } variable "TARGETS" { - default = ["base", "base-with-services", "lab", "full-stack", "qe"] + default = ["base", "base-with-services", "lab", "full-stack"] } function "tags" { @@ -54,10 +48,6 @@ group "default" { targets = "${TARGETS}" } -target "qe-meta" { - tags = tags("qe") -} - target "base-meta" { tags = tags("base") } @@ -114,16 +104,3 @@ target "full-stack" { } platforms = "${PLATFORMS}" } - -target "qe" { - inherits = ["qe-meta"] - context = "stack/qe" - contexts = { - full-stack = "target:full-stack" - } - args = { - "AIIDALAB_QE_VERSION" = "${AIIDALAB_QE_VERSION}" - "QE_VERSION" = "${QE_VERSION}" - } - platforms = "${PLATFORMS}" -} diff --git a/tests/conftest.py b/tests/conftest.py index e8cf4799..5524cc44 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -92,8 +92,3 @@ def aiidalab_version(_build_config): @pytest.fixture(scope="session") def aiidalab_home_version(_build_config): return _build_config["AIIDALAB_HOME_VERSION"]["default"] - - -@pytest.fixture(scope="session") -def qe_version(_build_config): - return _build_config["QE_VERSION"]["default"]