diff --git a/rex/utilities/hpc.py b/rex/utilities/hpc.py index 7af664fff..f9ab7b053 100644 --- a/rex/utilities/hpc.py +++ b/rex/utilities/hpc.py @@ -21,9 +21,6 @@ class HpcJobManager(SubprocessManager, ABC): """Abstract HPC job manager framework""" - # get username as class attribute. - USER = getpass.getuser() - # HPC queue column headers QCOL_NAME = None # Job name column QCOL_ID = None # Job integer ID column @@ -46,10 +43,7 @@ def __init__(self, user=None, queue_dict=None): from parse_queue_str(). None will get the queue from PBS or SLURM. """ - self._user = user - if self._user is None: - self._user = self.USER - + self._user = user or getpass.getuser() if queue_dict is not None and not isinstance(queue_dict, dict): emsg = ('HPC queue_dict arg must be None or Dict but received: ' '{}, {}'.format(queue_dict, type(queue_dict))) @@ -268,7 +262,7 @@ def query_queue(cls, job_name=None, user=None, qformat=None, """ if user is None: - user = cls.USER + user = getpass.getuser() if skip_rows is None: skip_rows = cls.QSKIP @@ -433,7 +427,7 @@ def query_queue(cls, job_name=None, user=None, qformat=None, job_name_str = ' -n {}'.format(job_name) if user is None: - user = cls.USER + user = getpass.getuser() if qformat is None: qformat = cls.SQ_FORMAT diff --git a/rex/version.py b/rex/version.py index 6a0771f39..fc425b740 100644 --- a/rex/version.py +++ b/rex/version.py @@ -1,3 +1,3 @@ """rex Version number""" -__version__ = "0.4.0" +__version__ = "0.4.1"