Omit empty optional load-script exports

Author: xylar

mache/deploy/templates/load.sh.j2

@@ -4,27 +4,43 @@
 
 export MACHE_DEPLOY_TARGET_SOFTWARE={{ software | tojson }}
 export MACHE_DEPLOY_TARGET_VERSION={{ software_version | tojson }}
+{% if runtime_version_cmd_sh != "''" %}
 export MACHE_DEPLOY_RUNTIME_VERSION_CMD={{ runtime_version_cmd_sh }}
+{% endif %}
+{% if toolchain_compiler %}
 export MACHE_DEPLOY_TOOLCHAIN_COMPILER={{ toolchain_compiler | tojson }}
+{% endif %}
+{% if toolchain_mpi %}
 export MACHE_DEPLOY_TOOLCHAIN_MPI={{ toolchain_mpi | tojson }}
+{% endif %}
+{% if spack_library_view %}
 export MACHE_DEPLOY_SPACK_LIBRARY_VIEW={{ spack_library_view | tojson }}
+{% endif %}
 export MACHE_DEPLOY_COMPUTE_PIXI_EXE={{ compute_pixi_exe | tojson }}
 export MACHE_DEPLOY_COMPUTE_PIXI_PREFIX={{ prefix | tojson }}
 export MACHE_DEPLOY_COMPUTE_PIXI_TOML={{ pixi_toml | tojson }}
 export MACHE_DEPLOY_COMPUTE_PIXI_MPI={{ compute_pixi_mpi | tojson }}
 export MACHE_DEPLOY_COMPUTE_TARGET_LOAD_SNIPPET={{ compute_target_load_snippet | tojson }}
+{% if login_pixi_toml %}
 export MACHE_DEPLOY_LOGIN_PIXI_EXE={{ login_pixi_exe | tojson }}
 export MACHE_DEPLOY_LOGIN_PIXI_PREFIX={{ login_prefix | tojson }}
 export MACHE_DEPLOY_LOGIN_PIXI_TOML={{ login_pixi_toml | tojson }}
 export MACHE_DEPLOY_LOGIN_PIXI_MPI={{ login_pixi_mpi | tojson }}
 export MACHE_DEPLOY_LOGIN_TARGET_LOAD_SNIPPET={{ login_target_load_snippet | tojson }}
+{% endif %}
+{% if machine %}
 export {{ software_upper }}_MACHINE={{ machine | tojson }}
+{% endif %}
 {% if branch_path %}
 export {{ software_upper }}_BRANCH={{ branch_path | tojson }}
 {% endif %}
 export {{ software_upper }}_VERSION={{ software_version | tojson }}
+{% if toolchain_compiler %}
 export {{ software_upper }}_COMPILER={{ toolchain_compiler | tojson }}
+{% endif %}
+{% if toolchain_mpi %}
 export {{ software_upper }}_MPI={{ toolchain_mpi | tojson }}
+{% endif %}
 export {{ software_upper }}_LOAD_SCRIPT={{ load_script | tojson }}
 
 # Activate the pixi environment in the *current* shell.

tests/test_deploy_run.py

@@ -469,6 +469,40 @@ def test_write_load_script_without_login_env_skips_compute_detection(
     assert 'MACHE_DEPLOY_ACTIVE_ENV_KIND="compute"' in script_text
 
 
+def test_write_load_script_omits_optional_exports_when_values_are_empty(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+):
+    monkeypatch.chdir(tmp_path)
+    pixi_exe = _make_pixi_executable(tmp_path)
+
+    script_path = deploy_run._write_load_script(
+        prefix=str(tmp_path / 'compute'),
+        login_env=None,
+        pixi_exe=pixi_exe,
+        branch_path=None,
+        load_script_pixi_exe=_path_load_script_pixi(),
+        software='e3sm-unified',
+        software_version='1.0.0',
+        runtime_version_cmd=None,
+        machine=None,
+        compute_pixi_mpi='nompi',
+        toolchain_compiler=None,
+        toolchain_mpi=None,
+        spack_library_view=None,
+        spack_activation='',
+    )
+
+    script_text = Path(script_path).read_text(encoding='utf-8')
+    assert 'MACHE_DEPLOY_RUNTIME_VERSION_CMD' not in script_text
+    assert 'MACHE_DEPLOY_LOGIN_PIXI_TOML' not in script_text
+    assert 'MACHE_DEPLOY_TOOLCHAIN_COMPILER' not in script_text
+    assert 'MACHE_DEPLOY_SPACK_LIBRARY_VIEW' not in script_text
+    assert 'E3SM_UNIFIED_MACHINE' not in script_text
+    assert 'E3SM_UNIFIED_COMPILER' not in script_text
+    assert 'E3SM_UNIFIED_MPI' not in script_text
+    assert 'E3SM_UNIFIED_LOAD_SCRIPT' in script_text
+
+
 def test_copy_mache_pixi_toml_writes_slim_bootstrap_manifest(tmp_path: Path):
     source_repo = tmp_path / 'source'
     source_repo.mkdir()