Merge branch 'master' into deps/bump-requests

Author: vkarak

reframe/frontend/cli.py

@@ -285,7 +285,7 @@ def main():
         envvar='RFM_STAGE_DIR', configvar='systems/stagedir'
     )
     output_options.add_argument(
-        '--save-log-files', action='store_true', default=False,
+        '--save-log-files', action='store_true',
         help='Save ReFrame log files to the output directory',
         envvar='RFM_SAVE_LOG_FILES', configvar='general/save_log_files'
     )
@@ -474,12 +474,12 @@ def main():
     # Environment options
     env_options.add_argument(
         '-M', '--map-module', action='append', metavar='MAPPING',
-        dest='module_mappings', default=[],
+        dest='module_mappings',
         help='Add a module mapping',
         envvar='RFM_MODULE_MAPPINGS ,', configvar='general/module_mappings'
     )
     env_options.add_argument(
-        '-m', '--module', action='append', default=[],
+        '-m', '--module', action='append',
         metavar='MOD', dest='user_modules',
         help='Load module MOD before running any regression check',
         envvar='RFM_USER_MODULES ,', configvar='general/user_modules'
@@ -501,13 +501,13 @@ def main():
         envvar='RFM_NON_DEFAULT_CRAYPE', configvar='general/non_default_craype'
     )
     env_options.add_argument(
-        '--purge-env', action='store_true', dest='purge_env', default=False,
+        '--purge-env', action='store_true', dest='purge_env',
         help='Unload all modules before running any regression check',
         envvar='RFM_PURGE_ENVIRONMENT', configvar='general/purge_environment'
     )
     env_options.add_argument(
         '-u', '--unload-module', action='append', metavar='MOD',
-        dest='unload_modules', default=[],
+        dest='unload_modules',
         help='Unload module MOD before running any regression check',
         envvar='RFM_UNLOAD_MODULES ,', configvar='general/unload_modules'
     )

reframe/utility/osext.py

@@ -692,27 +692,26 @@ def git_repo_exists(url, timeout=5):
         return True
 
 
-def git_repo_hash(commit='HEAD', short=True, wd=None):
+def git_repo_hash(commit='HEAD', short=True, wd='.'):
     '''Return the SHA1 hash of a Git commit.
 
     :arg commit: The commit to look at.
     :arg short: Return a short hash. This always corresponds to the first 8
         characters of the long hash. We don't rely on Git for the short hash,
         since depending on the version it might return either 7 or 8
         characters.
-    :arg wd: Change to this directory before retrieving the hash. If ``None``,
-        ReFrame's install prefix will be used.
+    :arg wd: Change to this directory before retrieving the hash.
     :returns: The Git commit hash or ``None`` if the hash could not be
         retrieved.
+
+    .. versionchanged:: 4.6.1
+       Default working directory is now ``.``.
     '''
     try:
-        wd = wd or reframe.INSTALL_PREFIX
-        with change_dir(wd):
-            # Do not log this command, since we need to call this function
-            # from the logger
-            completed = run_command(f'git rev-parse {commit}',
-                                    check=True, log=False)
-
+        # Do not log this command, since we need to call this function
+        # from the logger
+        completed = run_command(f'git -C {wd} rev-parse {commit}',
+                                check=True, log=False)
     except (SpawnedProcessError, FileNotFoundError):
         return None
 
@@ -730,13 +729,14 @@ def reframe_version():
     If ReFrame's installation contains the repository metadata and the current
     version is a pre-release version, the repository's hash will be appended
     to the actual version.
-
     '''
-    repo_hash = git_repo_hash()
-    if repo_hash and semver.VersionInfo.parse(reframe.VERSION).prerelease:
-        return f'{reframe.VERSION}+{repo_hash}'
-    else:
-        return reframe.VERSION
+    if (semver.VersionInfo.parse(reframe.VERSION).prerelease and
+        os.path.exists(os.path.join(reframe.INSTALL_PREFIX, '.git'))):
+        repo_hash = git_repo_hash(wd=reframe.INSTALL_PREFIX)
+        if repo_hash:
+            return f'{reframe.VERSION}+{repo_hash}'
+
+    return reframe.VERSION
 
 
 def expandvars(s):