From b3ace06a60b29b90d6e8ec0527ae608c066bcbf7 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sun, 27 Sep 2020 17:29:57 +0200 Subject: [PATCH] Drop history session workaround from threading work This was added in 41d3dc62f7e967ea3b409be410310563d0737bc4 because history may have been created in another thread. But we don't do that anymore, so we can drop this. --- lib/galaxy/tools/actions/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/galaxy/tools/actions/__init__.py b/lib/galaxy/tools/actions/__init__.py index 068397d9bcf..6d517914c78 100644 --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -252,12 +252,9 @@ class DefaultToolAction: def _collect_inputs(self, tool, trans, incoming, history, current_user_roles, collection_info): """ Collect history as well as input datasets and collections. """ - app = trans.app # Set history. if not history: history = tool.get_default_history_by_trans(trans, create=True) - if history not in trans.sa_session: - history = trans.sa_session.query(app.model.History).get(history.id) # Track input dataset collections - but replace with simply lists so collect # input datasets can process these normally.