From e954a74c3f0226536f7f2192d7efd0a4e914978e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 26 Jul 2023 10:06:46 +0200
Subject: [PATCH] Updated aqt and its usage to 3.1.6.
---
ogscm/recipes/ogs.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ogscm/recipes/ogs.py b/ogscm/recipes/ogs.py
index 74f6b82..c8430a8 100644
--- a/ogscm/recipes/ogs.py
+++ b/ogscm/recipes/ogs.py
@@ -428,10 +428,11 @@ if local_args.ogs != "clean":
qt_install_dir = "/opt/qt"
qt_version = versions["minimum_version"]["qt"]
qt_dir = f"{qt_install_dir}/{qt_version}/gcc_64"
- Stage0 += pip(pip="pip3", packages=["aqtinstall==1.2.5"])
+ Stage0 += pip(pip="pip3", packages=["aqtinstall==3.1.6"])
Stage0 += shell(
commands=[
- f"aqt install --outputdir {qt_install_dir} {qt_version} linux desktop -m xmlpatterns,x11extras"
+ f"aqt install-qt --outputdir {qt_install_dir} linux desktop {qt_version} gcc_64",
+ f"aqt install-qt --outputdir {qt_install_dir} linux desktop {qt_version} gcc_64 --archives qtxmlpatterns qtx11extras"
]
)
Stage1 += copy(_from="0", src=qt_install_dir, dest=qt_install_dir)
--
GitLab