Unverified Commit ca61f83e authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #19799 from mvdbeek/fix_tool_directory_transfer 

[24.2] Fix tool directory pulsar transfer
parents 53dec0c5 858593a8

lib/galaxy/dependencies/pinned-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ prompt-toolkit==3.0.48 
propcache==0.2.0

prov==1.5.1

psutil==6.1.0

pulsar-galaxy-lib==0.15.6

pulsar-galaxy-lib==0.15.7

pycparser==2.22

pycryptodome==3.21.0

pydantic==2.9.2

test/functional/tools/sample_tool_conf.xml

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ 
  <tool file="interactivetool_simple.xml" />

  <tool file="interactivetool_two_entry_points.xml" />

  <tool file="converter_target_datatype.xml" />

  <tool file="tool_directory_copy.xml" />



  <!-- Tools interesting only for building up test workflows. -->

test/functional/tools/tool_directory_copy.xml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
<tool id="tool_directory_copy" name="tool_directory_copy" version="0.1.0" profile="24.2">

    <!-- Copy a directory to a new location. -->

    <command><![CDATA[

cp -r '$__tool_directory__/realtime/simple' '$output_directory.extra_files_path'

    ]]></command>

    <outputs>

        <data name="output_directory" format="directory" />

    </outputs>

    <tests>

        <test>

            <output name="output_directory" ftype="directory">

                <extra_files type="file" name="Dockerfile" md5="ed0e3613e45ca9111121f78643afbb52"></extra_files>

            </output>

        </test>

    </tests>

</tool>

test/integration/test_pulsar_embedded.py

+1 −0
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ test_tools = integration_util.integration_tool_runner( 
        "composite_output",

        "composite_output_tests",

        "detect_errors",

        "tool_directory_copy",

    ]

)