From 36fdcd242d6f0cec4bf5a4e620d6d7caa1aa8cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 24 Nov 2021 15:21:28 +0100 Subject: [PATCH 1/3] no longer necessary to add bin to PATH --- easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb | 3 --- easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb | 3 --- easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb | 2 -- 7 files changed, 16 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb index 37be512a83b5..20ff9cea5ec6 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb @@ -71,7 +71,4 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions -modextrapaths = {'PATH': 'bin'} - moduleclass = 'devel' diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb index 77a03ef8b4bd..b11a4062702e 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb @@ -75,7 +75,4 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions -modextrapaths = {'PATH': 'bin'} - moduleclass = 'devel' diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb index a672d19e378d..51a6c010ad55 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb @@ -57,9 +57,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb index 134f250ccc08..a9880d87c885 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb @@ -51,9 +51,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb index 9fa373cba0c0..8313dce7680c 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb @@ -55,9 +55,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb index 6f417ffc47fc..34b3bc3efa06 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb @@ -62,9 +62,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb index 44e2cd25dda7..035377127316 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb @@ -53,9 +53,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } From 878165503dd88bce9049399c2b1e2832f96f0ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 24 Nov 2021 15:27:49 +0100 Subject: [PATCH 2/3] no longer necessary to add bin to PATH --- easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb | 2 -- easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb | 2 -- 6 files changed, 12 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb index be6da2fe133d..54ab6cd55cd4 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb @@ -55,9 +55,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb index a3f94b9c0c7d..8cef4c109622 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb @@ -55,9 +55,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb index ed0c71063202..a977d55f597c 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb @@ -54,9 +54,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb index 0b0383bc951e..a69c7c6cf4c3 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb @@ -53,9 +53,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb index ea6a733eb556..6f67b2659d94 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb @@ -54,9 +54,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb index 9b653bf3ab94..1ab08fd3685f 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb @@ -54,9 +54,7 @@ sanity_check_commands = ['reframe -V'] sanity_pip_check = True -# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing extensions modextrapaths = { - 'PATH': 'bin', # bootstrap script installs required dependencies to 'external' subdirectory 'PYTHONPATH': 'external', } From 42e2ab8b54eeee8f8d59a5b6d13a3657069299bf Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 9 Dec 2021 23:49:40 +0100 Subject: [PATCH 3/3] add bin subdir to $PATH in preinstallopts in ReFrame easyconfigs to ensure right pip command is used --- easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb | 5 +++++ easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb | 5 +++++ easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb | 6 ++++-- easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb | 2 ++ easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb | 6 ++++-- easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb | 4 +++- easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb | 4 +++- 13 files changed, 44 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb index 79cabdb2c427..71ff1be0f5c8 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.0.eb @@ -15,6 +15,11 @@ req_py_minver = 6 use_pip = True +exts_default_options = { + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && ", +} + exts_list = [ ('pip', '20.1.1', { 'checksums': ['27f8dc29387dd83249e06e681ce087e6061826582198a425085e0bf4c1cf3a55'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb index 1417a537b82d..14b90f4f54f1 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.2.eb @@ -15,6 +15,11 @@ req_py_minver = 6 use_pip = True +exts_default_options = { + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && ", +} + exts_list = [ ('pip', '20.2.4', { 'checksums': ['85c99a857ea0fb0aedf23833d9be5c40cf253fe24443f0829c7b472e23c364a1'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb index f4423aa3029a..7595b2ca7c8c 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.3.eb @@ -33,8 +33,10 @@ exts_list = [ # Use bootstrap script to install ReFrame dependencies under `external`. # ReFrame adds `external` to its own python path before executing, without - # affecting the python path of the system - 'preinstallopts': './bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ', + # affecting the python path of the system; + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", }), ] diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb index 82ee85ae7a83..e02756de89b3 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.4.1.eb @@ -25,7 +25,9 @@ exts_list = [ 'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], 'checksums': ['aed5752a2f687002839923c5432784d3a25d3a29d43b69122dcbf72befa0fdbf'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb index a5af6c89988b..28e5f5b4b491 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.0.eb @@ -25,7 +25,9 @@ exts_list = [ 'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], 'checksums': ['81b501be4252c99f12043cb21b0b7b8059207a340fc94173b180444599773f1a'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb index 34b3bc3efa06..f2df4f9de114 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.1.eb @@ -17,6 +17,8 @@ use_pip = True # bump hardcoded importlib-metadata version to more recent version, only require it with Python < 3.8 local_preinstallopts = r"""sed -i "s/\(importlib.*\)==.*/\1==3.10.0; python_version < '3.8'/g" requirements.txt && """ +# need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages +local_preinstallopts += "export PATH=%(installdir)s/bin:$PATH && " # use bootstrap script to install required Python packages local_preinstallopts += "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb index 035377127316..685bc826e33e 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.5.2.eb @@ -25,7 +25,9 @@ exts_list = [ 'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], 'checksums': ['50d461811f6bba7c9b897866a290063e1bd229e7055f5acc2de1f749b99bfce7'] diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb index 54ab6cd55cd4..ffed5ef3f855 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.2.eb @@ -25,8 +25,10 @@ exts_list = [ 'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'], }), ('reframe', version, { - 'prebuildopts': ('./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && ' - 'PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH '), + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'prebuildopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " + "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], 'use_pip': False, diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb index 8cef4c109622..adafa2b8796c 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.6.3.eb @@ -25,7 +25,9 @@ exts_list = [ 'checksums': ['1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5'], }), ('reframe', version, { - 'prebuildopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'prebuildopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb index a977d55f597c..43f074cd3eea 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.7.3.eb @@ -28,7 +28,9 @@ exts_list = [ 'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb index a69c7c6cf4c3..395aa64e6003 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.8.0.eb @@ -28,7 +28,9 @@ exts_list = [ 'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb index 6f67b2659d94..a365f15126b8 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.0.eb @@ -28,7 +28,9 @@ exts_list = [ 'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'], diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb index 1ab08fd3685f..efe48dd85fa2 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-3.9.1.eb @@ -28,7 +28,9 @@ exts_list = [ 'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'], }), ('reframe', version, { - 'preinstallopts': "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " + # need to add 'bin' subdir to $PATH explicitly to ensure right 'pip' command is used for installing packages + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', 'source_urls': ['https://github.com/eth-cscs/reframe/archive/'],