From d215764729407f36695c2b7e434c1ecdb665da85 Mon Sep 17 00:00:00 2001 From: jfgrimm Date: Tue, 23 Apr 2024 15:24:48 +0100 Subject: [PATCH 1/5] add renamed easyconfig params to ALTERNATE_PARAMTERS --- easybuild/framework/easyconfig/parser.py | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/easybuild/framework/easyconfig/parser.py b/easybuild/framework/easyconfig/parser.py index 5cab3b3ddf..6860eb87fd 100644 --- a/easybuild/framework/easyconfig/parser.py +++ b/easybuild/framework/easyconfig/parser.py @@ -45,6 +45,59 @@ # alternate easyconfig parameters, and their non-deprecated equivalents ALTERNATE_PARAMETERS = { # : , + 'build_deps': 'builddependencies', + 'build_in_install_dir': 'buildininstalldir', + 'build_opts': 'buildopts', + 'build_stats': 'buildstats', + 'clean_up_old_build': 'cleanupoldbuild', + 'clean_up_old_install': 'cleanupoldinstall', + 'configure_opts': 'configopts', + 'deps': 'dependencies', + 'doc_paths': 'docpaths', + 'doc_urls': 'docurls', + 'dont_create_install_dir': 'dontcreateinstalldir', + 'exts_class_map': 'exts_classmap', + 'exts_default_class': 'exts_default_class', + 'exts_default_opts': 'exts_default_options', + 'hidden_deps': 'hiddendependencies', + 'include_modulepath_exts': 'include_modpath_extensions', + 'install_opts': 'installopts', + 'keep_previous_install': 'keeppreviousinstall', + 'keep_symlinks': 'keepsymlinks', + 'max_parallel': 'maxparallel', + 'env_mod_aliases': 'modaliases', + 'env_mod_alt_soft_name': 'modaltsoftname', + 'modulepath_prepend_paths': 'moddependpaths', + 'env_mod_extra_paths_append': 'modextrapaths_append', + 'env_mod_extra_paths': 'modextrapaths', + 'env_mod_extra_vars': 'modextravars', + 'env_mod_load_msg': 'modloadmsg', + 'env_mod_lua_footer': 'modluafooter', + 'env_mod_tcl_footer': 'modtclfooter', + 'env_mod_class': 'moduleclass', + 'env_mod_depends_on': 'module_depends_on', + 'env_mod_force_unload': 'moduleforceunload', + 'env_mod_load_no_conflict': 'moduleloadnoconflict', + 'env_mod_unload_msg': 'modunloadmsg', + 'only_toolchain_mod_env': 'onlytcmod', + 'os_deps': 'osdependencies', + 'post_install_cmds': 'postinstallcmds', + 'post_install_msgs': 'postinstallmsgs', + 'post_install_patches': 'postinstallpatches', + 'pre_build_opts': 'prebuildopts', + 'pre_configure_opts': 'preconfigopts', + 'pre_install_opts': 'preinstallopts', + 'pre_test_opts': 'pretestopts', + 'recursive_env_mod_unload': 'recursive_module_unload', + 'run_test': 'runtest', + 'sanity_check_cmds': 'sanity_check_commands', + 'skip_fortran_mod_files_sanity_check': 'skip_mod_files_sanity_check', + 'skip_steps': 'skipsteps', + 'test_opts': 'testopts', + 'toolchain_opts': 'toolchainopts', + 'unpack_opts': 'unpack_options', + 'version_prefix': 'versionprefix', + 'version_suffix': 'versionsuffix', } # deprecated easyconfig parameters, and their replacements From 9dc92397885711a20bb0874d1c226ff2b8c726b6 Mon Sep 17 00:00:00 2001 From: jfgrimm Date: Tue, 23 Apr 2024 15:26:10 +0100 Subject: [PATCH 2/5] add renamed templates to ALTERNATE_TEMPLATES --- easybuild/framework/easyconfig/templates.py | 29 +++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/easybuild/framework/easyconfig/templates.py b/easybuild/framework/easyconfig/templates.py index 7ee17d2366..4ec9b4a25a 100644 --- a/easybuild/framework/easyconfig/templates.py +++ b/easybuild/framework/easyconfig/templates.py @@ -164,6 +164,35 @@ # alternate templates, and their equivalents ALTERNATE_TEMPLATES = { # : , + 'build_dir': 'builddir', + 'cuda_maj_ver': 'cudamajver', + 'cuda_maj_ver': 'cudamajver', + 'cuda_short_ver': 'cudashortver', + 'cuda_short_ver': 'cudashortver', + 'cuda_ver': 'cudaver', + 'cuda_ver': 'cudaver', + 'install_dir': 'installdir', + 'java_maj_ver': 'javamajver', + 'java_short_ver': 'javashortver', + 'java_ver': 'javaver', + 'name_letter_lower': 'nameletterlower', + 'name_letter': 'nameletter', + 'name_lower': 'namelower', + 'perl_maj_ver': 'perlmajver', + 'perl_short_ver': 'perlshortver', + 'perl_ver': 'perlver', + 'py_maj_ver': 'pymajver', + 'py_short_ver': 'pyshortver', + 'py_ver': 'pyver', + 'r_maj_ver': 'rmajver', + 'r_short_ver': 'rshortver', + 'r_ver': 'rver', + 'toolchain_ver': 'toolchain_version', + 'ver_maj_min': 'version_major_minor', + 'ver_maj': 'version_major', + 'ver_min': 'version_minor', + 'version_prefix': 'versionprefix', + 'version_suffix': 'versionsuffix', } # deprecated templates, and their replacements From 707d8b24e429fb81a89c69f2f5e698a193415d5d Mon Sep 17 00:00:00 2001 From: jfgrimm Date: Tue, 23 Apr 2024 15:33:23 +0100 Subject: [PATCH 3/5] add renamed template constants to ALTERNATE_TEMPLATE_CONSTANTS --- easybuild/framework/easyconfig/templates.py | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/easybuild/framework/easyconfig/templates.py b/easybuild/framework/easyconfig/templates.py index 4ec9b4a25a..139978396a 100644 --- a/easybuild/framework/easyconfig/templates.py +++ b/easybuild/framework/easyconfig/templates.py @@ -203,6 +203,43 @@ # alternate template constants, and their equivalents ALTERNATE_TEMPLATE_CONSTANTS = { # : , + 'APACHE_URL': 'APACHE_SOURCE', + 'BITBUCKET_GET_URL': 'BITBUCKET_SOURCE', + 'BITBUCKET_DOWNLOADS_URL': 'BITBUCKET_DOWNLOADS', + 'CRAN_URL': 'CRAN_SOURCE', + 'FTP_GNOME_URL': 'FTPGNOME_SOURCE', + 'GITHUB_URL': 'GITHUB_SOURCE', + 'GITHUB_URL_LOWER': 'GITHUB_LOWER_SOURCE', + 'GITHUB_RELEASE_URL': 'GITHUB_RELEASE', + 'GITHUB_RELEASE_URL_LOWER': 'GITHUB_LOWER_RELEASE', + 'GNU_SAVANNAH_URL': 'GNU_SAVANNAH_SOURCE', + 'GNU_URL': 'GNU_SOURCE', + 'GOOGLECODE_URL': 'GOOGLECODE_SOURCE', + 'LAUNCHPAD_URL': 'LAUNCHPAD_SOURCE', + 'PYPI_URL': 'PYPI_SOURCE', + 'PYPI_URL_LOWER': 'PYPI_LOWER_SOURCE', + 'R_URL': 'R_SOURCE', + 'SOURCEFORGE_URL': 'SOURCEFORGE_SOURCE', + 'XORG_DATA_URL': 'XORG_DATA_SOURCE', + 'XORG_LIB_URL': 'XORG_LIB_SOURCE', + 'XORG_PROTO_URL': 'XORG_PROTO_SOURCE', + 'XORG_UTIL_URL': 'XORG_UTIL_SOURCE', + 'XORG_XCB_URL': 'XORG_XCB_SOURCE', + 'SOURCE_LOWER_TAR_GZ': 'SOURCELOWER_TAR_GZ', + 'SOURCE_LOWER_TAR_XZ': 'SOURCELOWER_TAR_XZ', + 'SOURCE_LOWER_TAR_BZ2': 'SOURCELOWER_TAR_BZ2', + 'SOURCE_LOWER_TGZ': 'SOURCELOWER_TGZ', + 'SOURCE_LOWER_TXZ': 'SOURCELOWER_TXZ', + 'SOURCE_LOWER_TBZ2': 'SOURCELOWER_TBZ2', + 'SOURCE_LOWER_TB2': 'SOURCELOWER_TB2', + 'SOURCE_LOWER_GTGZ': 'SOURCELOWER_GTGZ', + 'SOURCE_LOWER_ZIP': 'SOURCELOWER_ZIP', + 'SOURCE_LOWER_TAR': 'SOURCELOWER_TAR', + 'SOURCE_LOWER_XZ': 'SOURCELOWER_XZ', + 'SOURCE_LOWER_TAR_Z': 'SOURCELOWER_TAR_Z', + 'SOURCE_LOWER_WHL': 'SOURCELOWER_WHL', + 'SOURCE_LOWER_PY2_WHL': 'SOURCELOWER_PY2_WHL', + 'SOURCE_LOWER_PY3_WHL': 'SOURCELOWER_PY3_WHL', } # deprecated template constants, and their replacements From f5122c7d5ae411cc533159f17fbf55a8f39414ee Mon Sep 17 00:00:00 2001 From: jfgrimm Date: Wed, 29 May 2024 13:24:24 +0100 Subject: [PATCH 4/5] add alternate template for cuda_compute_capabilities -> cuda_cc_comma_sep --- easybuild/framework/easyconfig/templates.py | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/framework/easyconfig/templates.py b/easybuild/framework/easyconfig/templates.py index 139978396a..737b105915 100644 --- a/easybuild/framework/easyconfig/templates.py +++ b/easybuild/framework/easyconfig/templates.py @@ -165,6 +165,7 @@ ALTERNATE_TEMPLATES = { # : , 'build_dir': 'builddir', + 'cuda_cc_comma_sep': 'cuda_compute_capabilities', 'cuda_maj_ver': 'cudamajver', 'cuda_maj_ver': 'cudamajver', 'cuda_short_ver': 'cudashortver', From 1bdc93965d123366c7dc5970ddf526f9e410a7f1 Mon Sep 17 00:00:00 2001 From: Jasper Grimm <65227842+jfgrimm@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:11:52 +0100 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Kenneth Hoste --- easybuild/framework/easyconfig/parser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/framework/easyconfig/parser.py b/easybuild/framework/easyconfig/parser.py index 6860eb87fd..4787bd97a4 100644 --- a/easybuild/framework/easyconfig/parser.py +++ b/easybuild/framework/easyconfig/parser.py @@ -55,9 +55,9 @@ 'deps': 'dependencies', 'doc_paths': 'docpaths', 'doc_urls': 'docurls', - 'dont_create_install_dir': 'dontcreateinstalldir', + 'do_not_create_install_dir': 'dontcreateinstalldir', 'exts_class_map': 'exts_classmap', - 'exts_default_class': 'exts_default_class', + 'exts_default_class': 'exts_defaultclass', 'exts_default_opts': 'exts_default_options', 'hidden_deps': 'hiddendependencies', 'include_modulepath_exts': 'include_modpath_extensions', @@ -74,12 +74,12 @@ 'env_mod_load_msg': 'modloadmsg', 'env_mod_lua_footer': 'modluafooter', 'env_mod_tcl_footer': 'modtclfooter', - 'env_mod_class': 'moduleclass', + 'env_mod_category': 'moduleclass', 'env_mod_depends_on': 'module_depends_on', 'env_mod_force_unload': 'moduleforceunload', 'env_mod_load_no_conflict': 'moduleloadnoconflict', 'env_mod_unload_msg': 'modunloadmsg', - 'only_toolchain_mod_env': 'onlytcmod', + 'only_toolchain_env_mod': 'onlytcmod', 'os_deps': 'osdependencies', 'post_install_cmds': 'postinstallcmds', 'post_install_msgs': 'postinstallmsgs',