Merge pull request galaxyproject#1634 from mvdbeek/add-nest-collection-distro-tool

Add nest_collection and other recent distro tools

Author: mvdbeek

planemo/galaxy/distro_tools.py

@@ -42,22 +42,44 @@
     "__IMPORT_HISTORY__": "${model_tools_path}/imp_exp/imp_history_from_archive.xml",
     "__EXPORT_HISTORY__": "${model_tools_path}/imp_exp/exp_history_to_archive.xml",
     "__ZIP_COLLECTION__": "${model_tools_path}/zip_collection.xml",
-    "__FILTER_FAILED_DATASETS__": "${model_tools_path}/filter_failed_collection.xml",
-    "__FILTER_EMPTY_DATASETS__": "${model_tools_path}/filter_empty_collection.xml",
+    "__FILTER_FAILED_DATASETS__": [
+        "${model_tools_path}/filter_failed_collection.xml",
+        "${model_tools_path}/filter_failed_collection_1.1.0.xml",
+    ],
+    "__FILTER_EMPTY_DATASETS__": [
+        "${model_tools_path}/filter_empty_collection.xml",
+        "${model_tools_path}/filter_empty_collection_1.1.0.xml",
+    ],
     "__FLATTEN__": "${model_tools_path}/flatten_collection.xml",
     "__MERGE_COLLECTION__": "${model_tools_path}/merge_collection.xml",
     "__RELABEL_FROM_FILE__": "${model_tools_path}/relabel_from_file.xml",
-    "__FILTER_FROM_FILE__": "${model_tools_path}/filter_from_file.xml",
+    "__FILTER_FROM_FILE__": [
+        "${model_tools_path}/filter_from_file.xml",
+        "${model_tools_path}/filter_from_file_1.1.0.xml",
+    ],
     "__TAG_FROM_FILE__": "${model_tools_path}/tag_collection_from_file.xml",
     "__APPLY_RULES__": "${model_tools_path}/apply_rules.xml",
     "__BUILD_LIST__": ["${model_tools_path}/build_list.xml", "${model_tools_path}/build_list_1.2.0.xml"],
     "__EXTRACT_DATASET__": "${model_tools_path}/extract_dataset.xml",
     "__DUPLICATE_FILE_TO_COLLECTION__": "${model_tools_path}/duplicate_file_to_collection.xml",
     "__CROSS_PRODUCT_FLAT__": "${model_tools_path}/cross_product_flat.xml",
     "__CROSS_PRODUCT_NESTED__": "${model_tools_path}/cross_product_nested.xml",
-    "__FILTER_NULL__": "${model_tools_path}/filter_null.xml",
-    "__HARMONIZELISTS__": "${model_tools_path}/harmonize_two_collections_list.xml",
-    "__KEEP_SUCCESS_DATASETS__": "${model_tools_path}/keep_success_collection.xml",
+    "__FILTER_NULL__": [
+        "${model_tools_path}/filter_null.xml",
+        "${model_tools_path}/filter_null_1.1.0.xml",
+    ],
+    "__HARMONIZELISTS__": [
+        "${model_tools_path}/harmonize_two_collections_list.xml",
+        "${model_tools_path}/harmonize_two_collections_list_1.0.0.xml",
+    ],
+    "__KEEP_SUCCESS_DATASETS__": [
+        "${model_tools_path}/keep_success_collection.xml",
+        "${model_tools_path}/keep_success_collection_1.1.0.xml",
+    ],
+    "__NEST__": "${model_tools_path}/nest_collection.xml",
+    "__CONVERT_SAMPLE_SHEET__": "${model_tools_path}/convert_sample_sheet.xml",
+    "__SAMPLE_SHEET_TO_TABULAR__": "${model_tools_path}/sample_sheet_to_tabular.xml",
+    "__SPLIT_PAIRED_AND_UNPAIRED__": "${model_tools_path}/split_paired_and_unpaired.xml",
     "biomart": "data_source/biomart.xml",
     "Sff_extractor": "filters/sff_extractor.xml",
     "secure_hash_message_digest": "filters/secure_hash_message_digest.xml",