Merge pull request #8 from boegel/hidden_easyconfig

fix help message for 'hidden' + use available auto-cleaned tmp dir in test

Author: geimer

easybuild/framework/easyconfig/default.py

@@ -88,7 +88,7 @@
     'easyblock': [None, "EasyBlock to use for building; if set to None, an easyblock is selected "
                         "based on the software name", BUILD],
     'easybuild_version': [None, "EasyBuild-version this spec-file was written for", BUILD],
-    'hidden': [False, "Install module file as 'hidden' by prefixing its name with '.'", BUILD],
+    'hidden': [False, "Install module file as 'hidden' by prefixing its version with '.'", BUILD],
     'installopts': ['', 'Extra options for installation', BUILD],
     'maxparallel': [None, 'Max degree of parallelism', BUILD],
     'parallel': [None, ('Degree of parallelism for e.g. make (default: based on the number of '

easybuild/tools/options.py

@@ -279,7 +279,7 @@ def override_options(self):
             'group': ("Group to be used for software installations (only verified, not set)", None, 'store', None),
             'group-writable-installdir': ("Enable group write permissions on installation directory after installation",
                                           None, 'store_true', False),
-            'hidden': ("Install 'hidden' module file(s) by prefixing their name with '.'", None, 'store_true', False),
+            'hidden': ("Install 'hidden' module file(s) by prefixing their version with '.'", None, 'store_true', False),
             'ignore-osdeps': ("Ignore any listed OS dependencies", None, 'store_true', False),
             'filter-deps': ("Comma separated list of dependencies that you DON'T want to install with EasyBuild, "
                             "because equivalent OS packages are installed. (e.g. --filter-deps=zlib,ncurses)",

test/framework/toy_build.py

@@ -743,11 +743,10 @@ def test_toy_hidden_cmdline(self):
 
     def test_toy_hidden_easyconfig(self):
         """Test installing a hidden module using the 'hidden = True' easyconfig parameter."""
-        tmpdir = tempfile.mkdtemp()
         # copy toy easyconfig file, and add hiding option to it
         ec_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'toy-0.0.eb')
-        shutil.copy2(ec_file, tmpdir)
-        ec_file = os.path.join(tmpdir, 'toy-0.0.eb')
+        shutil.copy2(ec_file, self.test_prefix)
+        ec_file = os.path.join(self.test_prefix, 'toy-0.0.eb')
         write_file(ec_file, "\nhidden = True\n", append=True)
         self.test_toy_build(ec_file=ec_file, verify=False)
         # module file is hidden
@@ -758,7 +757,6 @@ def test_toy_hidden_easyconfig(self):
         # installed software is not hidden
         toybin = os.path.join(self.test_installpath, 'software', 'toy', '0.0', 'bin', 'toy')
         self.assertTrue(os.path.exists(toybin))
-        shutil.rmtree(tmpdir)
 
     def test_module_filepath_tweaking(self):
         """Test using --suffix-modules-path."""