Merge pull request #4683 from lexming/soft-pythonpath

avoid breaking Python environment by prepending CIME paths to PYTHONPATH
ESMCI · Sep 20, 2024 · 0cc20bf · 0cc20bf
2 parents 64b2335 + 777cd60
commit 0cc20bf
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/CIME/utils.py b/CIME/utils.py
@@ -820,12 +820,10 @@ def run_cmd(
  # or build a relative path and append `sys.path` to import
  # `standard_script_setup`. Providing `PYTHONPATH` fixes protential
  # broken paths in external python.
- env.update(
- {
- "CIMEROOT": f"{get_cime_root()}",
- "PYTHONPATH": f"{get_cime_root()}:{get_tools_path()}",
- }
- )
+ env_pythonpath = os.environ.get("PYTHONPATH", "").split(":")
+ cime_pythonpath = [f"{get_cime_root()}", f"{get_tools_path()}"] + env_pythonpath
+ env["PYTHONPATH"] = ":".join(filter(None, cime_pythonpath))
+ env["CIMEROOT"] = f"{get_cime_root()}"
 
  if timeout:
  with Timeout(timeout):