From 31e65db65a3d2cd2634d372bf0aafdb35ccea2f8 Mon Sep 17 00:00:00 2001
From: "Marcel R." <github.riga@icloud.com>
Date: Mon, 10 Jun 2024 16:39:42 +0200
Subject: [PATCH] Update upstream cf.

---
 hbt/columnflow_patches.py | 27 ---------------------------
 hbt/tasks/parameters.py   |  8 --------
 modules/columnflow        |  2 +-
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/hbt/columnflow_patches.py b/hbt/columnflow_patches.py
index e55999d5..53bbe11b 100644
--- a/hbt/columnflow_patches.py
+++ b/hbt/columnflow_patches.py
@@ -55,34 +55,7 @@ def htcondor_job_resources(self, job_num, branches):
     logger.debug(f"patched htcondor_job_resources of {HTCondorWorkflow.task_family}")
 
 
-@memoize
-def patch_user_parameters():
-    """
-    Adds user parameters to some tasks.
-    """
-    from hbt.tasks.parameters import user_parameter_inst
-    from columnflow.tasks.framework.remote import (
-        BundleRepo,
-        BundleSoftware,
-        BuildBashSandbox,
-        BundleBashSandbox,
-        BundleCMSSWSandbox,
-    )
-
-    for cls in [
-        BundleRepo,
-        BundleSoftware,
-        BuildBashSandbox,
-        BundleBashSandbox,
-        BundleCMSSWSandbox,
-    ]:
-        cls.user_parameter = user_parameter_inst
-
-    logger.debug("patched user parameters")
-
-
 @memoize
 def patch_all():
     patch_bundle_repo_exclude_files()
     patch_htcondor_workflow_naf_resources()
-    patch_user_parameters()
diff --git a/hbt/tasks/parameters.py b/hbt/tasks/parameters.py
index 936d3265..8acb6918 100644
--- a/hbt/tasks/parameters.py
+++ b/hbt/tasks/parameters.py
@@ -4,8 +4,6 @@
 Custom, common parameters.
 """
 
-import getpass
-
 import luigi
 
 
@@ -17,9 +15,3 @@
     default=False,
     description="escape some characters for markdown; default: False",
 )
-user_parameter_inst = luigi.Parameter(
-    default=getpass.getuser(),
-    description="the user running the current task, mainly for central schedulers to distinguish "
-    "between tasks that should or should not be run in parallel by multiple users; "
-    "default: current user",
-)
diff --git a/modules/columnflow b/modules/columnflow
index c6b7d07b..1c36773d 160000
--- a/modules/columnflow
+++ b/modules/columnflow
@@ -1 +1 @@
-Subproject commit c6b7d07bf3afd49c270ad9cc0e27b9eef3756923
+Subproject commit 1c36773d9b14c15af2626285db5fd1b7e43ff287