Skip to content

remove deprecated options from easyconfig.py: disable_templating + default_fallback option in get_easyblock_class #4278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 2 commits into from
Sep 6, 2023
Merged

remove deprecated options from easyconfig.py: disable_templating + default_fallback option in get_easyblock_class #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbf5e44
remove deprecated options from easyconfig.py
branfosj Jun 11, 2023
2c720d8
remove test for removed option
branfosj Jun 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions easybuild/framework/easyconfig/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,20 +403,6 @@ def get_toolchain_hierarchy(parent_toolchain, incl_capabilities=False):
return toolchain_hierarchy


@contextmanager
def disable_templating(ec):
"""Temporarily disable templating on the given EasyConfig

Usage:
with disable_templating(ec):
# Do what you want without templating
# Templating set to previous value
"""
_log.deprecated("disable_templating(ec) was replaced by ec.disable_templating()", '5.0')
with ec.disable_templating() as old_value:
yield old_value


class EasyConfig(object):
"""
Class which handles loading, reading, validation of easyconfigs
Expand Down Expand Up @@ -1857,19 +1843,10 @@ def det_installversion(version, toolchain_name, toolchain_version, prefix, suffi
_log.nosupport('Use det_full_ec_version from easybuild.tools.module_generator instead of %s' % old_fn, '2.0')


def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error_on_missing_easyblock=None, **kwargs):
def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error_on_missing_easyblock=True, **kwargs):
"""
Get class for a particular easyblock (or use default)
"""
if 'default_fallback' in kwargs:
msg = "Named argument 'default_fallback' for get_easyblock_class is deprecated, "
msg += "use 'error_on_missing_easyblock' instead"
_log.deprecated(msg, '4.0')
if error_on_missing_easyblock is None:
error_on_missing_easyblock = kwargs['default_fallback']
elif error_on_missing_easyblock is None:
error_on_missing_easyblock = True

cls = None
try:
if easyblock:
Expand Down
11 changes: 0 additions & 11 deletions test/framework/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,17 +1528,6 @@ def test_get_easyblock_class(self):
self.assertErrorRegex(EasyBuildError, "Failed to import EB_TOY", get_easyblock_class, None, name='TOY')
self.assertEqual(get_easyblock_class(None, name='TOY', error_on_failed_import=False), None)

# also test deprecated default_fallback named argument
self.assertErrorRegex(EasyBuildError, "DEPRECATED", get_easyblock_class, None, name='gzip',
default_fallback=False)

orig_value = easybuild.tools.build_log.CURRENT_VERSION
easybuild.tools.build_log.CURRENT_VERSION = '3.9'
self.mock_stderr(True)
self.assertEqual(get_easyblock_class(None, name='gzip', default_fallback=False), None)
self.mock_stderr(False)
easybuild.tools.build_log.CURRENT_VERSION = orig_value

def test_letter_dir(self):
"""Test letter_dir_for function."""
test_cases = {
Expand Down