Unverified Commit eb38fd8e authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.2' into dev

parents c212434d 65d265fd

lib/galaxy/tool_util/parameters/factory.py

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ def _from_input_source_galaxy(input_source: InputSource, profile: float) -> Tool 
            optional = input_source.parse_optional()

            default_value = input_source.parse_default()

            return DataCollectionParameterModel(

                collection_type=input_source.get("collection_type"),

                name=input_source.parse_name(),

                optional=optional,

                value=default_value,

lib/galaxy/workflow/run.py

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ class WorkflowProgress: 
                        raise modules.FailWorkflowEvaluation(

                            why=InvocationFailureDatasetFailed(

                                reason=FailureReason.dataset_failed,

                                hda_id=replacement.id,

                                hda_id=dataset_instance.id,

                                workflow_step_id=connection.input_step_id,

                                dependent_workflow_step_id=output_step_id,

                            )

packages/meta/HISTORY.rst

+6 −5
Original line number Diff line number Diff line
@@ -3,14 +3,15 @@ History 


.. to_doc



---------

23.2.dev0

---------



-----------

24.2.4.dev0

-----------





---------------------



-------------------

19.9.0 (2019-11-21)

---------------------

-------------------



* Initial import from dev branch of Galaxy during 19.09 development cycle.

test/functional/tools/parameters/gx_data_collection_list.xml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<tool id="gx_data_collection_list" name="gx_data_collection_list" version="1.0.0">

    <command><![CDATA[

cat '$parameter' >> '$output'

    ]]></command>

    <inputs>

        <param name="parameter" type="data_collection" collection_type="list" ext="data" />

    </inputs>

    <outputs>

        <data name="output" format="data" />

    </outputs>

    <tests>

        <!-- TODO: -->

    </tests>

</tool>

test/unit/tool_util/test_input_models.py

0 → 100644
+12 −0
Original line number Diff line number Diff line 
from galaxy.tool_util.models import parse_tool

from galaxy.tool_util.parameters.models import DataCollectionParameterModel

from galaxy.tool_util.parser.factory import get_tool_source

from galaxy.tool_util.unittest_utils import functional_test_tool_path





def test_input_collection_type():

    tool_source = get_tool_source(functional_test_tool_path("parameters/gx_data_collection_list.xml"))

    tool = parse_tool(tool_source)

    tool_input = tool.inputs[0]

    assert isinstance(tool_input, DataCollectionParameterModel)

    assert tool_input.collection_type == "list"