Merge pull request #14415 from bedroge/remove_reframe_bin_from_path

don't add bin subdir to $PATH via modextrapaths in ReFrame easyconfigs
easybuilders · Dec 9, 2021 · ce19945 · ce19945
2 parents c32de10 + 42e2ab8
commit ce19945
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 40 deletions.
diff --git 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'],
@@ -69,7 +74,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
@@ -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'],
@@ -73,7 +78,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
@@ -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 && ",
     }),
 ]
 
@@ -55,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
@@ -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'],
@@ -49,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
@@ -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'],
@@ -53,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
@@ -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 && "
 
@@ -62,9 +64,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
@@ -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']
@@ -53,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.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,
@@ -55,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.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/'],
@@ -55,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.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/'],
@@ -54,9 +56,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
@@ -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/'],
@@ -53,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.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/'],
@@ -54,9 +56,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
@@ -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/'],
@@ -54,9 +56,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',
 }