Merge pull request #4243 from branfosj/generic

remove deprecated is_generic_easyblock from easyconfig.py

easybuild/framework/easyconfig/easyconfig.py

@@ -1945,12 +1945,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,

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
@@ -3738,22 +3738,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')