Skip to content

Guard getpass call #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ppinchuk merged 2 commits into from
Jun 2, 2025
Merged

Guard getpass call #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5517149
Delay `getpass` call
ppinchuk Jun 2, 2025
471b1e9
Bump version
ppinchuk Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions rex/utilities/hpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)))
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rex/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""rex Version number"""

__version__ = "0.4.0"
__version__ = "0.4.1"