Merge pull request easybuilders#1128 from boegel/v1.16.x

release EasyBuild v1.16.1

Author: boegel

RELEASE_NOTES

@@ -3,6 +3,17 @@ For more detailed information, please see the git log.
 
 These release notes can also be consulted at http://easybuild.readthedocs.org/en/latest/Release_notes.html.
 
+v1.16.1 (December 19th 2014)
+----------------------------
+
+bugfix release
+- fix functionality that is broken with --deprecated=2.0 or with $EASYBUILD_DEPRECATED=2.0
+    - don't include easyconfig parameters for ConfigureMake in eb -a, since fallback is deprecated (#1123)
+    - correctly check software_license value type (#1124)
+    - fix generate_software_list.py script w.r.t. deprecated fallback to ConfigureMake (#1127)
+- other bug fixes
+    - fix logging issues in tests, sync with vsc-base v2.0.0 (#1120)
+
 v1.16.0 (December 18th 2014)
 ----------------------------
 

easybuild/framework/easyconfig/easyconfig.py

@@ -99,13 +99,13 @@ def new_ec_method(self, key, *args, **kwargs):
         # make sure that value for software_license has correct type, convert if needed
         if key == 'software_license':
             # key 'license' will already be mapped to 'software_license' above
-            lic = self._config['software_license']
-            if not isinstance(lic, License):
+            lic = self._config['software_license'][0]
+            if lic is not None and not isinstance(lic, License):
                 self.log.deprecated('Type for software_license must to be instance of License (sub)class', '2.0')
                 lic_type = type(lic)
 
                 class LicenseLegacy(License, lic_type):
-                    """A special License class to deal with legacy license paramters"""
+                    """A special License class to deal with legacy license parameters"""
                     DESCRICPTION = ("Internal-only, legacy closed license class to deprecate license parameter."
                                     " (DO NOT USE).")
                     HIDDEN = False

easybuild/scripts/generate_software_list.py

@@ -126,12 +126,13 @@
             log.info("found valid easyconfig %s" % ec)
             if not ec.name in names:
                 log.info("found new software package %s" % ec)
+                ec.easyblock = None
                 # check if an easyblock exists
-                module = get_easyblock_class(None, name=ec.name).__module__.split('.')[-1]
-                if module != "configuremake":
-                    ec.easyblock = module
-                else:
-                    ec.easyblock = None
+                ebclass = get_easyblock_class(None, name=ec.name, default_fallback=False)
+                if ebclass is not None:
+                    module = ebclass.__module__.split('.')[-1]
+                    if module != "configuremake":
+                        ec.easyblock = module
                 configs.append(ec)
                 names.append(ec.name)
         except Exception, err:

easybuild/tools/options.py

@@ -508,10 +508,12 @@ def avail_easyconfig_params(self):
         """
         Print the available easyconfig parameters, for the given easyblock.
         """
-        app = get_easyblock_class(self.options.easyblock)
-        extra = app.extra_options()
+        extra = []
+        app = get_easyblock_class(self.options.easyblock, default_fallback=False)
+        if app is not None:
+            extra = app.extra_options()
         mapping = convert_to_help(extra, has_default=False)
-        if len(extra) > 0:
+        if extra:
             ebb_msg = " (* indicates specific for the %s EasyBlock)" % app.__name__
             extra_names = [x[0] for x in extra]
         else:

easybuild/tools/version.py

@@ -37,7 +37,7 @@
 
 # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1"
 # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware!
-VERSION = LooseVersion("1.16.0")
+VERSION = LooseVersion("1.16.1")
 UNKNOWN = "UNKNOWN"
 
 def get_git_revision():

test/framework/options.py

@@ -382,6 +382,7 @@ def run_test(custom=None, extra_params=[]):
             if os.path.exists(dummylogfn):
                 os.remove(dummylogfn)
 
+        run_test()
         run_test(custom='EB_foo', extra_params=['foo_extra1', 'foo_extra2'])
         run_test(custom='bar', extra_params=['bar_extra1', 'bar_extra2'])
         run_test(custom='EB_foofoo', extra_params=['foofoo_extra1', 'foofoo_extra2'])

test/framework/utilities.py

@@ -131,9 +131,13 @@ def tearDown(self):
         # restore original Python search path
         sys.path = self.orig_sys_path
 
-        for path in [self.test_buildpath, self.test_installpath, self.test_prefix]:
+        # cleanup
+        for path in [self.logfile, self.test_buildpath, self.test_installpath, self.test_prefix]:
             try:
-                shutil.rmtree(path)
+                if os.path.isdir(path):
+                    shutil.rmtree(path)
+                else:
+                    os.remove(path)
             except OSError, err:
                 pass
 

vsc/README.md

@@ -1,3 +1,3 @@
 Code from https://github.com/hpcugent/vsc-base
 
-based on 2146be5301da34043adf4646169e5dfec88cd2f5 (vsc-base v1.9.9)
+based on eb47bee435e5e24666b398d8dd41f82a40214b7a (vsc-base v2.0.0)

vsc/utils/generaloption.py

@@ -1,6 +1,6 @@
 #
 #
-# Copyright 2011-2013 Ghent University
+# Copyright 2011-2014 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -708,7 +708,7 @@ def __init__(self, **kwargs):
         go_args = kwargs.pop('go_args', None)
         self.no_system_exit = kwargs.pop('go_nosystemexit', None)  # unit test option
         self.use_configfiles = kwargs.pop('go_useconfigfiles', self.CONFIGFILES_USE)  # use or ignore config files
-        self.configfiles = kwargs.pop('go_configfiles', self.CONFIGFILES_INIT)  # configfiles to parse
+        self.configfiles = kwargs.pop('go_configfiles', self.CONFIGFILES_INIT[:])  # configfiles to parse
         configfiles_initenv = kwargs.pop('go_configfiles_initenv', None)  # initial environment for configfiles to parse
         prefixloggername = kwargs.pop('go_prefixloggername', False)  # name of logger is same as envvar prefix
         mainbeforedefault = kwargs.pop('go_mainbeforedefault', False)  # Set the main options before the default ones