From 91614524f1efdf171a01243749bd23de1daf9638 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Wed, 24 Aug 2022 15:41:53 +0200 Subject: [PATCH 1/2] ensure that pineappl and lhapdf exist before installing vrap --- pinefarm/install.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pinefarm/install.py b/pinefarm/install.py index 31f85b51..8e9e8fb7 100644 --- a/pinefarm/install.py +++ b/pinefarm/install.py @@ -81,6 +81,10 @@ def hawaiian_vrap(): bool whether vrap is now installed """ + # Ensure that pineappl and lhapdf are installed + _ = pineappl(capi=True) + _ = lhapdf() + vrapx = configs.configs["commands"]["vrap"] if is_exe(vrapx): From a562b51ab69f3d8c854bbbb142b6a153e683e4ee Mon Sep 17 00:00:00 2001 From: juacrumar Date: Sat, 27 Aug 2022 20:00:20 +0200 Subject: [PATCH 2/2] change the order of pineappl and lhapdf installation so that it is more natural --- pinefarm/install.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pinefarm/install.py b/pinefarm/install.py index 8e9e8fb7..2a96c16f 100644 --- a/pinefarm/install.py +++ b/pinefarm/install.py @@ -82,8 +82,8 @@ def hawaiian_vrap(): whether vrap is now installed """ # Ensure that pineappl and lhapdf are installed - _ = pineappl(capi=True) _ = lhapdf() + _ = pineappl(capi=True) vrapx = configs.configs["commands"]["vrap"] @@ -185,9 +185,8 @@ def cli_installed(): return True print("Installing...") - - if not pkgconfig.exists("lhapdf"): - lhapdf() + # Ensure lhapdf is installed + _ = lhapdf() if capi and not installed(): try: