From 2016344f3713c7b42715d5ba36dd057ddcac3cb6 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 15 Apr 2023 10:43:24 +0100 Subject: [PATCH] remove deprecated is_generic_easyblock from easyconfig.py --- easybuild/framework/easyconfig/easyconfig.py | 6 ------ test/framework/easyconfig.py | 18 +----------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/easybuild/framework/easyconfig/easyconfig.py b/easybuild/framework/easyconfig/easyconfig.py index 90c9a9609d..3e30d32d92 100644 --- a/easybuild/framework/easyconfig/easyconfig.py +++ b/easybuild/framework/easyconfig/easyconfig.py @@ -1950,12 +1950,6 @@ def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error raise EasyBuildError("Failed to obtain class for %s easyblock (not available?): %s", easyblock, err) -def is_generic_easyblock(easyblock): - """Return whether specified easyblock name is a generic easyblock or not.""" - _log.deprecated("is_generic_easyblock function was moved to easybuild.tools.filetools", '5.0') - return filetools.is_generic_easyblock(easyblock) - - def get_module_path(name, generic=None, decode=True): """ Determine the module path for a given easyblock or software name, diff --git a/test/framework/easyconfig.py b/test/framework/easyconfig.py index 7bf72fc57b..2761158a0a 100644 --- a/test/framework/easyconfig.py +++ b/test/framework/easyconfig.py @@ -52,7 +52,7 @@ from easybuild.framework.easyconfig.constants import EXTERNAL_MODULE_MARKER from easybuild.framework.easyconfig.easyconfig import ActiveMNS, EasyConfig, create_paths, copy_easyconfigs from easybuild.framework.easyconfig.easyconfig import det_subtoolchain_version, fix_deprecated_easyconfigs -from easybuild.framework.easyconfig.easyconfig import is_generic_easyblock, get_easyblock_class, get_module_path +from easybuild.framework.easyconfig.easyconfig import get_easyblock_class, get_module_path from easybuild.framework.easyconfig.easyconfig import letter_dir_for, process_easyconfig, resolve_template from easybuild.framework.easyconfig.easyconfig import triage_easyconfig_params, verify_easyconfig_filename from easybuild.framework.easyconfig.licenses import License, LicenseGPLv3 @@ -3751,22 +3751,6 @@ def test_get_paths_for(self): if env_eb_script_path: os.environ['EB_SCRIPT_PATH'] = env_eb_script_path - def test_is_generic_easyblock(self): - """Test for is_generic_easyblock function.""" - - # is_generic_easyblock in easyconfig.py is deprecated, moved to filetools.py - self.allow_deprecated_behaviour() - - self.mock_stderr(True) - - for name in ['Binary', 'ConfigureMake', 'CMakeMake', 'PythonPackage', 'JAR']: - self.assertTrue(is_generic_easyblock(name)) - - for name in ['EB_bzip2', 'EB_DL_underscore_POLY_underscore_Classic', 'EB_GCC', 'EB_WRF_minus_Fire']: - self.assertFalse(is_generic_easyblock(name)) - - self.mock_stderr(False) - def test_get_module_path(self): """Test get_module_path function.""" self.assertEqual(get_module_path('EB_bzip2', generic=False), 'easybuild.easyblocks.bzip2')