From af4065cb5201dc571b97c1d9e1bd624adca3eb99 Mon Sep 17 00:00:00 2001 From: Satish Kamath Date: Mon, 17 Jul 2023 17:50:37 +0200 Subject: [PATCH 1/3] Adding hpctestlib to the PYTHONPATH. --- easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb index dc290fcc04d..4ff8a0f466d 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb @@ -58,6 +58,8 @@ sanity_pip_check = True modextrapaths = { # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', + # hpctestlib should be a part of the PYTHONPATH + 'PYTHONPATH': 'hpctestlib', } moduleclass = 'devel' From 0785c0b65dcb1e8dd91d59a1bbf55b4306616edd Mon Sep 17 00:00:00 2001 From: satishskamath <41335185+satishskamath@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:30:39 +0200 Subject: [PATCH 2/3] Update easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb Co-authored-by: Simon Branford <4967+branfosj@users.noreply.github.com> --- easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb index 4ff8a0f466d..bb27d3d5fb2 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb @@ -57,9 +57,8 @@ sanity_pip_check = True modextrapaths = { # bootstrap script installs required dependencies to 'external' subdirectory - 'PYTHONPATH': 'external', # hpctestlib should be a part of the PYTHONPATH - 'PYTHONPATH': 'hpctestlib', + 'PYTHONPATH': ['external', 'hpctestlib'], } moduleclass = 'devel' From 718620da79b32b8b42112095c0a195ebeaba96e0 Mon Sep 17 00:00:00 2001 From: Satish Kamath Date: Tue, 18 Jul 2023 19:03:42 +0200 Subject: [PATCH 3/3] Now hpctestlib is copied to external which is included in the PYTHONPATH. --- easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb index bb27d3d5fb2..b00fc07a257 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.2.0.eb @@ -38,7 +38,10 @@ exts_list = [ ] postinstallcmds = [ - "cp -a hpctestlib tools tutorials %(installdir)s", + "cp -a tools tutorials %(installdir)s", + # Adding hpctestlib separately to the external directory so that it can be + # imported and is in the PYTHONPATH + "cp -a hpctestlib %(installdir)s/external", "mkdir -p %(installdir)s/share && cp -a share/completions %(installdir)s/share/completions", r"sed -i 's@/\(python[0-9.]*\)$@/\1 -S@g' %(installdir)s/bin/reframe", ] @@ -48,7 +51,7 @@ sanity_check_paths = { 'share/completions/reframe.bash', 'share/completions/reframe.fish', 'share/completions/reframe.tcsh'], - 'dirs': ['external', 'hpctestlib', 'lib', 'tools', 'tutorials'] + 'dirs': ['external', 'lib', 'tools', 'tutorials'] } sanity_check_commands = ['reframe -V'] @@ -57,8 +60,7 @@ sanity_pip_check = True modextrapaths = { # bootstrap script installs required dependencies to 'external' subdirectory - # hpctestlib should be a part of the PYTHONPATH - 'PYTHONPATH': ['external', 'hpctestlib'], + 'PYTHONPATH': 'external', } moduleclass = 'devel'