Source bash files in non-interactive mode (conda#13012)

Co-authored-by: Jannis Leidel <[email protected]>
dreglad · Sep 25, 2023 · 7a777b8 · 7a777b8
1 parent 2745211
commit 7a777b8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/conda/activate.py b/conda/activate.py
@@ -1030,7 +1030,7 @@ class XonshActivator(_Activator):
     run_script_tmpl = (
         'source-cmd --suppress-skip-message "%s"'
         if on_win
-        else 'source-bash --suppress-skip-message "%s"'
+        else 'source-bash --suppress-skip-message -n "%s"'
     )
 
     hook_source_path = join(CONDA_PACKAGE_ROOT, "shell", "conda.xsh")

diff --git a/news/13012-dont-source-interactive b/news/13012-dont-source-interactive
@@ -0,0 +1,20 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* ``XonshActivator`` now uses ``source-bash`` in non-interactive mode to avoid
+  side-effects from interactively loaded RC files
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>
diff --git a/tests/test_activate.py b/tests/test_activate.py
@@ -1734,7 +1734,7 @@ def test_xonsh_basic(shell_wrapper_unit: str):
             join(shell_wrapper_unit, "etc", "conda", "activate.d", "activate1.bat")
         )
     else:
-        e_activate_info["sourcer"] = "source-bash --suppress-skip-message"
+        e_activate_info["sourcer"] = "source-bash --suppress-skip-message -n"
         e_activate_info["activate1"] = activator.path_conversion(
             join(shell_wrapper_unit, "etc", "conda", "activate.d", "activate1.sh")
         )
@@ -1786,7 +1786,7 @@ def test_xonsh_basic(shell_wrapper_unit: str):
                 )
             )
         else:
-            e_reactivate_info["sourcer"] = "source-bash --suppress-skip-message"
+            e_reactivate_info["sourcer"] = "source-bash --suppress-skip-message -n"
             e_reactivate_info["activate1"] = activator.path_conversion(
                 join(shell_wrapper_unit, "etc", "conda", "activate.d", "activate1.sh")
             )
@@ -1838,7 +1838,7 @@ def test_xonsh_basic(shell_wrapper_unit: str):
                 )
             )
         else:
-            e_deactivate_info["sourcer"] = "source-bash --suppress-skip-message"
+            e_deactivate_info["sourcer"] = "source-bash --suppress-skip-message -n"
             e_deactivate_info["deactivate1"] = activator.path_conversion(
                 join(
                     shell_wrapper_unit, "etc", "conda", "deactivate.d", "deactivate1.sh"