Skip to content

Commit dbf5e44

Browse files
committed
remove deprecated options from easyconfig.py
1 parent 822f335 commit dbf5e44

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

easybuild/framework/easyconfig/easyconfig.py

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -403,20 +403,6 @@ def get_toolchain_hierarchy(parent_toolchain, incl_capabilities=False):
403403
return toolchain_hierarchy
404404

405405

406-
@contextmanager
407-
def disable_templating(ec):
408-
"""Temporarily disable templating on the given EasyConfig
409-
410-
Usage:
411-
with disable_templating(ec):
412-
# Do what you want without templating
413-
# Templating set to previous value
414-
"""
415-
_log.deprecated("disable_templating(ec) was replaced by ec.disable_templating()", '5.0')
416-
with ec.disable_templating() as old_value:
417-
yield old_value
418-
419-
420406
class EasyConfig(object):
421407
"""
422408
Class which handles loading, reading, validation of easyconfigs
@@ -1857,19 +1843,10 @@ def det_installversion(version, toolchain_name, toolchain_version, prefix, suffi
18571843
_log.nosupport('Use det_full_ec_version from easybuild.tools.module_generator instead of %s' % old_fn, '2.0')
18581844

18591845

1860-
def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error_on_missing_easyblock=None, **kwargs):
1846+
def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error_on_missing_easyblock=True, **kwargs):
18611847
"""
18621848
Get class for a particular easyblock (or use default)
18631849
"""
1864-
if 'default_fallback' in kwargs:
1865-
msg = "Named argument 'default_fallback' for get_easyblock_class is deprecated, "
1866-
msg += "use 'error_on_missing_easyblock' instead"
1867-
_log.deprecated(msg, '4.0')
1868-
if error_on_missing_easyblock is None:
1869-
error_on_missing_easyblock = kwargs['default_fallback']
1870-
elif error_on_missing_easyblock is None:
1871-
error_on_missing_easyblock = True
1872-
18731850
cls = None
18741851
try:
18751852
if easyblock:

0 commit comments

Comments
 (0)