Merge branch 'develop' into oneapi_generic

Author: bartoldeman

.github/workflows/unit_tests.yml

@@ -46,15 +46,9 @@ jobs:
           - python: 3.5
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua
-          - python: 3.5
-            modules_tool: ${{needs.setup.outputs.lmod8}}
-            module_syntax: Tcl
           - python: 3.7
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua
-          - python: 3.7
-            modules_tool: ${{needs.setup.outputs.lmod8}}
-            module_syntax: Tcl
           - python: 3.8
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua
@@ -64,15 +58,9 @@ jobs:
           - python: 3.9
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua
-          - python: 3.9
-            modules_tool: ${{needs.setup.outputs.lmod8}}
-            module_syntax: Tcl
           - python: '3.10'
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua
-          - python: '3.10'
-            modules_tool: ${{needs.setup.outputs.lmod8}}
-            module_syntax: Tcl
           - python: '3.11'
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua

contrib/hooks/add_delete_configopt.py

@@ -3,7 +3,7 @@
 # Author: Åke Sandgren, HPC2N
 
 # We need to be able to distinguish between versions of OpenMPI
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 
 def pre_configure_hook(self, *args, **kwargs):

contrib/hooks/hpc2n_hooks.py

@@ -4,8 +4,8 @@
 
 import os
 
-from distutils.version import LooseVersion
 from easybuild.framework.easyconfig.format.format import DEPENDENCY_PARAMETERS
+from easybuild.tools import LooseVersion
 from easybuild.tools.filetools import apply_regex_substitutions
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.modules import get_software_root

easybuild/base/fancylogger.py

@@ -83,8 +83,8 @@
 import threading
 import traceback
 import weakref
-from distutils.version import LooseVersion
 
+from easybuild.tools import LooseVersion
 from easybuild.tools.py2vs3 import raise_with_traceback, string_type
 
 

easybuild/framework/easyblock.py

@@ -50,7 +50,6 @@
 import time
 import traceback
 from datetime import datetime
-from distutils.version import LooseVersion
 
 import easybuild.tools.environment as env
 import easybuild.tools.toolchain as toolchain
@@ -64,7 +63,7 @@
 from easybuild.framework.easyconfig.tools import dump_env_easyblock, get_paths_for
 from easybuild.framework.easyconfig.templates import TEMPLATE_NAMES_EASYBLOCK_RUN_STEP, template_constant_dict
 from easybuild.framework.extension import Extension, resolve_exts_filter_template
-from easybuild.tools import config, run
+from easybuild.tools import LooseVersion, config, run
 from easybuild.tools.build_details import get_build_stats
 from easybuild.tools.build_log import EasyBuildError, dry_run_msg, dry_run_warning, dry_run_set_dirs
 from easybuild.tools.build_log import print_error, print_msg, print_warning

easybuild/framework/easyconfig/easyconfig.py

@@ -44,7 +44,6 @@
 import functools
 import os
 import re
-from distutils.version import LooseVersion
 from contextlib import contextmanager
 
 import easybuild.tools.filetools as filetools
@@ -60,6 +59,7 @@
 from easybuild.framework.easyconfig.parser import DEPRECATED_PARAMETERS, REPLACED_PARAMETERS
 from easybuild.framework.easyconfig.parser import EasyConfigParser, fetch_parameters_from_easyconfig
 from easybuild.framework.easyconfig.templates import TEMPLATE_CONSTANTS, TEMPLATE_NAMES_DYNAMIC, template_constant_dict
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, print_warning, print_msg
 from easybuild.tools.config import GENERIC_EASYBLOCK_PKG, LOCAL_VAR_NAMING_CHECK_ERROR, LOCAL_VAR_NAMING_CHECK_LOG
 from easybuild.tools.config import LOCAL_VAR_NAMING_CHECK_WARN

easybuild/framework/easyconfig/format/version.py

@@ -31,7 +31,7 @@
 """
 import operator as op
 import re
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.tools.build_log import EasyBuildError

easybuild/framework/easyconfig/format/yeb.py

@@ -32,11 +32,11 @@
 import copy
 import os
 import platform
-from distutils.version import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig.format.format import EasyConfigFormat
 from easybuild.framework.easyconfig.format.pyheaderconfigobj import build_easyconfig_constants_dict
+from easybuild.tools import LooseVersion
 from easybuild.tools.py2vs3 import string_type
 from easybuild.tools.utilities import INDENT_4SPACES, only_if_module_is_available, quote_str
 

easybuild/framework/easyconfig/tools.py

@@ -43,7 +43,6 @@
 import re
 import sys
 import tempfile
-from distutils.version import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig import EASYCONFIGS_PKG_SUBDIR
@@ -52,6 +51,7 @@
 from easybuild.framework.easyconfig.easyconfig import process_easyconfig
 from easybuild.framework.easyconfig.format.yeb import quote_yaml_special_chars
 from easybuild.framework.easyconfig.style import cmdline_easyconfigs_style_check
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, print_msg, print_warning
 from easybuild.tools.config import build_option
 from easybuild.tools.environment import restore_env

easybuild/framework/easyconfig/tweak.py

@@ -41,7 +41,6 @@
 import os
 import re
 import tempfile
-from distutils.version import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig.constants import EASYCONFIG_CONSTANTS
@@ -54,6 +53,7 @@
 from easybuild.framework.easyconfig.tools import alt_easyconfig_paths
 from easybuild.toolchains.compiler.systemcompiler import TC_CONSTANT_SYSTEM
 from easybuild.toolchains.gcccore import GCCcore
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, print_warning
 from easybuild.tools.config import build_option
 from easybuild.tools.filetools import read_file, write_file