Hotfix notifications from sandboxed tasks.

dsavoiu · Jan 21, 2025 · e521901 · e521901
1 parent 699fad0
commit e521901
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/columnflow/tasks/framework/base.py b/columnflow/tasks/framework/base.py
@@ -98,7 +98,7 @@ class AnalysisTask(BaseTask, law.SandboxTask):
     exclude_params_index = {"user"}
     exclude_params_req = {"user", "notify_slack", "notify_mattermost", "notify_custom"}
     exclude_params_repr = {"user", "notify_slack", "notify_mattermost", "notify_custom"}
-    exclude_params_branch = {"user", "notify_slack", "notify_mattermost", "notify_custom"}
+    exclude_params_branch = {"user"}
     exclude_params_workflow = {"user", "notify_slack", "notify_mattermost", "notify_custom"}
 
     # cached and parsed sections of the law config for faster lookup

diff --git a/sandboxes/_setup_cmssw.sh b/sandboxes/_setup_cmssw.sh
@@ -334,7 +334,7 @@ setup_cmssw() {
 
     # prepend persistent path fragments again to ensure priority for local packages and
     # remove the conda based python fragments since there are too many overlaps between packages
-    export PYTHONPATH="${CF_PERSISTENT_PYTHONPATH}:$( echo ${PYTHONPATH} | sed "s|${CF_CONDA_PYTHONPATH}||g" )"
+    export PYTHONPATH="${CF_INITIAL_PYTHONPATH}:${CF_PERSISTENT_PYTHONPATH}:$( echo ${PYTHONPATH} | sed "s|${CF_CONDA_PYTHONPATH}||g" )"
     export PATH="${CF_PERSISTENT_PATH}:${PATH}"
 
     # mark this as a bash sandbox for law

diff --git a/sandboxes/_setup_venv.sh b/sandboxes/_setup_venv.sh
@@ -148,7 +148,7 @@ setup_venv() {
 
     # prepend persistent path fragments to priotize packages in the outer env
     export CF_VENV_PYTHONPATH="${install_path}/lib/python${pyv}/site-packages"
-    export PYTHONPATH="${CF_PERSISTENT_PYTHONPATH}:${CF_VENV_PYTHONPATH}:${PYTHONPATH}"
+    export PYTHONPATH="${CF_INITIAL_PYTHONPATH}:${CF_PERSISTENT_PYTHONPATH}:${CF_VENV_PYTHONPATH}:${PYTHONPATH}"
     export PATH="${CF_PERSISTENT_PATH}:${PATH}"