Skip to content

[feat] Update temp_environment to use env_vars as an argument #2707

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
merged 1 commit into from
Dec 9, 2022
Merged

[feat] Update temp_environment to use env_vars as an argument #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions reframe/core/runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,13 @@ def valid_sysenv_comb(valid_systems, valid_prog_environs,
class temp_environment:
'''Context manager to temporarily change the environment.'''

def __init__(self, modules=[], variables=[]):
self._modules = modules
self._variables = variables
def __init__(self, modules=None, env_vars=None):
self._modules = modules or []
self._env_vars = env_vars or {}

def __enter__(self):
new_env = Environment('_rfm_temp_env', self._modules,
self._variables.items())
self._env_vars.items())
self._environ_save, _ = loadenv(new_env)
return new_env

Expand Down
2 changes: 1 addition & 1 deletion reframe/core/schedulers/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def poll(self, *jobs):
if not jobs:
return

with rt.temp_environment(variables={'SLURM_TIME_FORMAT': '%s'}):
with rt.temp_environment(env_vars={'SLURM_TIME_FORMAT': '%s'}):
t_start = time.strftime(
'%F', time.localtime(min(job.submit_time for job in jobs))
)
Expand Down
4 changes: 2 additions & 2 deletions reframe/frontend/autodetect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,12 @@ def detect_topology():
vars.update(part.local_env.env_vars)

# Unconditionally detect the system for fully local partitions
with runtime.temp_environment(modules=modules, variables=vars):
with runtime.temp_environment(modules=modules, env_vars=vars):
part._processor = ProcessorInfo(cpuinfo())

_save_info(topo_file, part.processor.info)
elif detect_remote_systems:
with runtime.temp_environment(modules=modules, variables=vars):
with runtime.temp_environment(modules=modules, env_vars=vars):
part._processor = ProcessorInfo(_remote_detect(part))

if part.processor.info:
Expand Down
8 changes: 4 additions & 4 deletions unittests/test_argparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def extended_parser():


def test_option_precedence(default_exec_ctx, extended_parser):
with rt.temp_environment(variables={
with rt.temp_environment(env_vars={
'RFM_TIMESTAMP': '%F',
'RFM_NON_DEFAULT_CRAYPE': 'yes',
'RFM_MODULES_PRELOAD': 'a,b,c',
Expand All @@ -162,7 +162,7 @@ def test_option_precedence(default_exec_ctx, extended_parser):


def test_option_with_config(default_exec_ctx, extended_parser, tmp_path):
with rt.temp_environment(variables={
with rt.temp_environment(env_vars={
'RFM_TIMESTAMP': '%F',
'RFM_NON_DEFAULT_CRAYPE': 'yes',
'RFM_MODULES_PRELOAD': 'a,b,c',
Expand All @@ -187,7 +187,7 @@ def test_option_with_config(default_exec_ctx, extended_parser, tmp_path):


def test_option_envvar_conversion_error(default_exec_ctx, extended_parser):
with rt.temp_environment(variables={
with rt.temp_environment(env_vars={
'RFM_NON_DEFAULT_CRAYPE': 'foo',
'RFM_GIT_TIMEOUT': 'non-float'
}):
Expand All @@ -198,7 +198,7 @@ def test_option_envvar_conversion_error(default_exec_ctx, extended_parser):


def test_envvar_option(default_exec_ctx, extended_parser):
with rt.temp_environment(variables={'RFM_ENV_OPT': 'BAR'}):
with rt.temp_environment(env_vars={'RFM_ENV_OPT': 'BAR'}):
options = extended_parser.parse_args([])
assert options.env_option == 'BAR'

Expand Down