Merge branch 'release_18.09' into release_19.01

lib/galaxy/jobs/actions/post.py

@@ -282,9 +282,10 @@ class ColumnSetAction(DefaultJobAction):
                 for k, v in action.action_arguments.items():
                     if v:
                         # Try to use both pure integer and 'cX' format.
-                        if v[0] == 'c':
-                            v = v[1:]
-                        v = int(v)
+                        if not isinstance(v, int):
+                            if v[0] == 'c':
+                                v = v[1:]
+                            v = int(v)
                         if v != 0:
                             setattr(dataset_assoc.dataset.metadata, k, v)
 

lib/galaxy/workflow/modules.py

@@ -45,6 +45,7 @@ from galaxy.tools.parameters.basic import (
 )
 from galaxy.tools.parameters.history_query import HistoryQuery
 from galaxy.tools.parameters.wrapped import make_dict_copy
+from galaxy.util import unicodify
 from galaxy.util.bunch import Bunch
 from galaxy.util.json import safe_loads
 from galaxy.util.odict import odict
@@ -1329,7 +1330,7 @@ class ToolModule(WorkflowModule):
         replacement_parameters = set()
         for pja in step.post_job_actions:
             for argument in pja.action_arguments.values():
-                for match in re.findall(r'\$\{(.+?)\}', argument):
+                for match in re.findall(r'\$\{(.+?)\}', unicodify(argument)):
                     replacement_parameters.add(match)
 
         return list(replacement_parameters)