Merge pull request #919 from kysrpex/move_cz-pulsar_alphafold_rule_to…

…_tools.yml Move rule cz-pulsar_alphafold to tools.yml
usegalaxy-eu · Oct 2, 2023 · 6301076 · 6301076
2 parents 3886cd1 + e09c6e2
commit 6301076
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/files/galaxy/tpv/tool_defaults.yml b/files/galaxy/tpv/tool_defaults.yml
@@ -42,14 +42,6 @@ tools:
               entity.tpv_tags = entity.tpv_tags.combine(
                   TagSetManager(tags=[pulsar_tag])
               )
-      - id: cz-pulsar_alphafold
-        if: |
-          all((
-              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags},
-              tool.id.startswith("toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold"),
-              helpers.tool_version_gte(tool, '2.3.1'),
-          ))
-        gpus: 1
 
     rank: |
       final_destinations = helpers.weighted_random_sampling(candidate_destinations)

diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
@@ -267,6 +267,13 @@ tools:
       - id: model_preset_multimer
         if: job.get_param_values(app).get("model_preset") == "multimer"
         mem: 69
+      - id: cz-pulsar_alphafold
+        if: |
+          (
+              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags}
+              and helpers.tool_version_gte(tool, '2.3.1')
+          )
+        gpus: 1
     scheduling:
       require:
         - singularity