Merge branch 'release_24.0' into release_24.1

lib/galaxy/jobs/runners/pulsar.py

@@ -322,7 +322,12 @@ def check_watched_item_state(self, job_state):
 
     def _update_job_state_for_status(self, job_state, pulsar_status, full_status=None):
         log.debug("(%s) Received status update: %s", job_state.job_id, pulsar_status)
-        if pulsar_status in ["complete", "cancelled"] or job_state.job_wrapper.get_state() == model.Job.states.STOPPED:
+        if pulsar_status in ["complete", "cancelled"]:
+            self.mark_as_finished(job_state)
+            return None
+        if job_state.job_wrapper.get_state() == model.Job.states.STOPPED:
+            client = self.get_client_from_state(job_state)
+            client.kill()
             self.mark_as_finished(job_state)
             return None
         if pulsar_status in ["failed", "lost"]:

lib/galaxy/tools/__init__.py

@@ -3236,7 +3236,9 @@ def check_dataset_state(state):
                     )
 
         for input_dataset in input_datasets.values():
-            check_dataset_state(input_dataset.state)
+            if input_dataset:
+                # None is a possible input for optional inputs
+                check_dataset_state(input_dataset.state)
 
         for input_dataset_collection_pairs in input_dataset_collections.values():
             for input_dataset_collection, _ in input_dataset_collection_pairs:

lib/galaxy/tools/build_list_1.2.0.xml

@@ -44,7 +44,7 @@ Description
 
 This tool combines individual datasets or collections into a new collection. The simplest scenario is building a new colection from individual datasets (case **A** in the image below). You can merge a collection with individual dataset(s). In this case (see **B** in the image below) the individual dataset(s) will be merged with each element of the input collection to create a nested collection. Finally, two or more collection can be merged together creating a nested collection (case **C** in the image below).
 
-.. class:: warningmark 
+.. class:: warningmark
 
 **Note**: When merging collections (e.g., case **C** below) the input collection **must** have equal number of elements.
 
@@ -77,6 +77,7 @@ This tool will create a new collection from your history datasets but your quota
     </test>
     <test>
       <repeat name="datasets">
+        <param name="input" value_json="null"/>
       </repeat>
       <output_collection name="output" type="list" count="0">
       </output_collection>