Skip to content

Commit 56db19c

Browse files
authored
Merge pull request #4425 from branfosj/tmod_min
bump minimum required Tmod (4.x) to 4.3.0
2 parents 8569344 + 96371bd commit 56db19c

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

easybuild/tools/modules.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ class ModulesTool(object):
148148
VERSION_OPTION = '--version'
149149
# minimal required version (cannot include -beta or rc)
150150
REQ_VERSION = None
151-
# minimal required version to use getenv Tcl modulefile command
152-
REQ_VERSION_TCL_GETENV = None
153151
# minimal required version to check user's group in modulefile
154152
REQ_VERSION_TCL_CHECK_GROUP = None
155153
# deprecated version limit (support for versions below this version is deprecated)
@@ -1322,12 +1320,10 @@ class EnvironmentModules(ModulesTool):
13221320
NAME = "Environment Modules"
13231321
COMMAND = os.path.join(os.getenv('MODULESHOME', 'MODULESHOME_NOT_DEFINED'), 'libexec', 'modulecmd.tcl')
13241322
COMMAND_ENVIRONMENT = 'MODULES_CMD'
1325-
REQ_VERSION = '4.0.0'
1326-
REQ_VERSION_TCL_GETENV = '4.2.0'
1327-
DEPR_VERSION = '4.0.0'
1323+
REQ_VERSION = '4.3.0'
1324+
DEPR_VERSION = '4.3.0'
13281325
MAX_VERSION = None
13291326
REQ_VERSION_TCL_CHECK_GROUP = '4.6.0'
1330-
REQ_VERSION_SAFE_AUTO_LOAD = '4.2.4'
13311327
VERSION_REGEXP = r'^Modules\s+Release\s+(?P<version>\d[^+\s]*)(\+\S*)?\s'
13321328

13331329
SHOW_HIDDEN_OPTION = '--all'
@@ -1355,9 +1351,9 @@ def __init__(self, *args, **kwargs):
13551351

13561352
super(EnvironmentModules, self).__init__(*args, **kwargs)
13571353
version = LooseVersion(self.version)
1358-
self.supports_tcl_getenv = version >= LooseVersion(self.REQ_VERSION_TCL_GETENV)
1354+
self.supports_tcl_getenv = True
13591355
self.supports_tcl_check_group = version >= LooseVersion(self.REQ_VERSION_TCL_CHECK_GROUP)
1360-
self.supports_safe_auto_load = version >= LooseVersion(self.REQ_VERSION_SAFE_AUTO_LOAD)
1356+
self.supports_safe_auto_load = True
13611357

13621358
def check_module_function(self, allow_mismatch=False, regex=None):
13631359
"""Check whether selected module tool matches 'module' function definition."""

0 commit comments

Comments
 (0)