Skip to content

Commit 04d0127

Browse files
authored
Merge pull request #135 from martenson/toolsumsa
UMSA - configure panel views, cleanup toolset
2 parents a196cc8 + 01b840a commit 04d0127

File tree

7 files changed

+305
-100
lines changed

7 files changed

+305
-100
lines changed
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Tools
2+
type: generic
3+
id: all_tools
4+
items:
5+
- sections:
6+
- upload_file
7+
- collection_operations
8+
- expression_tools
9+
- id: general_text_label
10+
text: General Text Tools
11+
type: label
12+
- sections:
13+
- text_manipulation
14+
- table_manipulation
15+
- filter_and_sort
16+
- convert
17+
- convert_formats
18+
- builtin_converters
19+
- id: stats_viz
20+
text: Statistics and Visualization
21+
type: label
22+
- sections:
23+
- visualization
24+
- statistics
25+
- machine_learning
26+
- id: umsa_label
27+
text: UMSA TOOLS
28+
type: label
29+
- sections:
30+
- recetox
31+
- recetox_aplcms
32+
- camera
33+
- chemicaltoolbox
34+
- isa_tools
35+
- xcms
36+
- secimtools
37+
- metams
38+
- w4m
39+
- metfrag
40+
- sirius
41+
- mspurity
42+
- openms
43+
- matchms
44+
- mfassignr
45+
- qcxms
46+
- pre_processing
47+
- post_processing
48+
- proteomics
49+
- recetox_test
Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<toolbox monitor="true">
3+
<section id="upload_file" name="Upload Data">
4+
<tool file="data_source/upload.xml" />
5+
</section>
6+
<!-- <section id="data_source_tools" name="External Data">
7+
<tool file="data_source/ucsc_tablebrowser.xml" />
8+
<tool file="data_source/ucsc_tablebrowser_archaea.xml" />
9+
<tool file="data_source/ncbi_datasets.xml" />
10+
<tool file="data_source/ebi_sra.xml" />
11+
<tool file="data_source/sra.xml" />
12+
<tool file="data_source/microbial_import.xml" />
13+
<tool file="data_source/biomart.xml" />
14+
<tool file="data_source/cbi_rice_mart.xml" />
15+
<tool file="data_source/gramene_mart.xml" />
16+
<tool file="data_source/fly_modencode.xml" />
17+
<tool file="data_source/intermine.xml" />
18+
<tool file="data_source/flymine.xml" />
19+
<tool file="data_source/modmine.xml" />
20+
<tool file="data_source/mousemine.xml" />
21+
<tool file="data_source/ratmine.xml" />
22+
<tool file="data_source/yeastmine.xml" />
23+
<tool file="data_source/metabolicmine.xml" />
24+
<tool file="data_source/worm_modencode.xml" />
25+
<tool file="data_source/wormbase.xml" />
26+
<tool file="data_source/zebrafishmine.xml" />
27+
<tool file="data_source/eupathdb.xml" />
28+
<tool file="data_source/hbvar.xml" />
29+
</section> -->
30+
<section id="send_data" name="Send Data">
31+
<tool file="data_export/send.xml" />
32+
<!-- <tool file="data_export/export_remote.xml" /> -->
33+
</section>
34+
<section id="collection_operations" name="Collection Operations">
35+
<tool file="${model_tools_path}/unzip_collection.xml" />
36+
<tool file="${model_tools_path}/zip_collection.xml" />
37+
<tool file="${model_tools_path}/filter_failed_collection.xml" />
38+
<tool file="${model_tools_path}/filter_empty_collection.xml" />
39+
<tool file="${model_tools_path}/filter_null.xml" />
40+
<tool file="${model_tools_path}/flatten_collection.xml" />
41+
<tool file="${model_tools_path}/merge_collection.xml" />
42+
<tool file="${model_tools_path}/relabel_from_file.xml" />
43+
<tool file="${model_tools_path}/filter_from_file.xml" />
44+
<tool file="${model_tools_path}/sort_collection_list.xml" />
45+
<tool file="${model_tools_path}/harmonize_two_collections_list.xml" />
46+
<tool file="${model_tools_path}/cross_product_flat.xml" />
47+
<tool file="${model_tools_path}/cross_product_nested.xml" />
48+
<tool file="${model_tools_path}/tag_collection_from_file.xml" />
49+
<tool file="${model_tools_path}/apply_rules.xml" />
50+
<tool file="${model_tools_path}/build_list.xml" />
51+
<tool file="${model_tools_path}/build_list_1.2.0.xml" />
52+
<tool file="${model_tools_path}/extract_dataset.xml" />
53+
<tool file="${model_tools_path}/duplicate_file_to_collection.xml" />
54+
</section>
55+
<section id="expression_tools" name="Expression Tools">
56+
<tool file="expression_tools/parse_values_from_file.xml"/>
57+
</section>
58+
<label id="general_text_label" text="General Text Tools" />
59+
<section id="text_manipulation" name="Text Manipulation">
60+
<tool file="filters/fixedValueColumn.xml" />
61+
<tool file="filters/catWrapper.xml" />
62+
<tool file="filters/cutWrapper.xml" />
63+
<tool file="filters/mergeCols.xml" hidden="true" />
64+
<tool file="filters/convert_characters.xml" />
65+
<tool file="filters/CreateInterval.xml" />
66+
<tool file="filters/cutWrapper.xml" />
67+
<tool file="filters/changeCase.xml" />
68+
<tool file="filters/pasteWrapper.xml" />
69+
<tool file="filters/remove_beginning.xml" />
70+
<tool file="filters/randomlines.xml" />
71+
<tool file="filters/headWrapper.xml" />
72+
<tool file="filters/tailWrapper.xml" />
73+
<tool file="filters/trimmer.xml" />
74+
<tool file="filters/wc_gnu.xml" />
75+
<tool file="filters/secure_hash_message_digest.xml" />
76+
</section>
77+
<section id="filter_and_sort" name="Filter and Sort">
78+
<tool file="stats/filtering_1_1_0.xml" />
79+
<tool file="stats/filtering.xml" />
80+
<tool file="filters/sorter.xml" />
81+
<tool file="filters/grep.xml" />
82+
<tool file="filters/grep_1.0.1.xml"/>
83+
<!-- <tool file="filters/gff/extract_GFF_Features.xml" />
84+
<tool file="filters/gff/gff_filter_by_attribute.xml" />
85+
<tool file="filters/gff/gff_filter_by_feature_count.xml" />
86+
<tool file="filters/gff/gtf_filter_by_attribute_values_list.xml" /> -->
87+
</section>
88+
<section id="table_manipulation" name="Table Manipulation">
89+
<tool file="filters/joiner.xml" />
90+
<tool file="filters/compare.xml" />
91+
<tool file="stats/grouping.xml" />
92+
</section>
93+
<!-- <label id="genomic_manip_label" text="Genomic File Manipulation" />
94+
<section id="convert_formats" name="Convert Formats">
95+
<tool file="filters/axt_to_concat_fasta.xml" />
96+
<tool file="filters/axt_to_fasta.xml" />
97+
<tool file="filters/axt_to_lav.xml" />
98+
<tool file="filters/bed2gff.xml" />
99+
<tool file="filters/gff2bed.xml" />
100+
<tool file="filters/lav_to_bed.xml" />
101+
<tool file="maf/maf_to_bed.xml" />
102+
<tool file="maf/maf_to_interval.xml" />
103+
<tool file="maf/maf_to_fasta.xml" />
104+
<tool file="filters/wiggle_to_simple.xml" />
105+
<tool file="filters/sff_extractor.xml" />
106+
<tool file="filters/gtf2bedgraph.xml" />
107+
<tool file="filters/wig_to_bigwig.xml" />
108+
<tool file="filters/bed_to_bigbed.xml" />
109+
<tool file="extract/liftOver_wrapper.xml" />
110+
<tool file="filters/ucsc_gene_bed_to_exon_bed.xml" />
111+
<tool file="stats/aggregate_binned_scores_in_intervals.xml" />
112+
</section> -->
113+
<!-- <section id="fetch_sequences___alignments" name="Fetch Sequences / Alignments">
114+
<tool file="maf/interval2maf_pairwise.xml" />
115+
<tool file="maf/interval2maf.xml" />
116+
<tool file="maf/maf_split_by_species.xml" />
117+
<tool file="maf/interval_maf_to_merged_fasta.xml" />
118+
<tool file="maf/genebed_maf_to_fasta.xml" />
119+
<tool file="maf/maf_stats.xml" />
120+
<tool file="maf/maf_thread_for_species.xml" />
121+
<tool file="maf/maf_limit_to_species.xml" />
122+
<tool file="maf/maf_limit_size.xml" />
123+
<tool file="maf/maf_by_block_number.xml" />
124+
<tool file="maf/maf_reverse_complement.xml" />
125+
<tool file="maf/maf_filter.xml" />
126+
</section> -->
127+
<!-- <section id="mapping" name="Mapping" version="">
128+
<tool file="sr_mapping/bfast_wrapper.xml" />
129+
<tool file="sr_mapping/PerM.xml" />
130+
<tool file="sr_mapping/srma_wrapper.xml" />
131+
<tool file="sr_mapping/mosaik.xml" />
132+
</section> -->
133+
<!-- <section id="phenotype_association" name="Phenotype Association">
134+
<tool file="phenotype_association/linkToGProfile.xml" />
135+
<tool file="phenotype_association/linkToDavid.xml" />
136+
<tool file="phenotype_association/ldtools.xml" />
137+
<tool file="phenotype_association/pass.xml" />
138+
<tool file="phenotype_association/gpass.xml" />
139+
<tool file="phenotype_association/beam.xml" />
140+
<tool file="phenotype_association/lps.xml" />
141+
<tool file="phenotype_association/master2pg.xml" />
142+
</section> -->
143+
<section id="statistics" name="Statistics">
144+
<tool file="stats/gsummary.xml" />
145+
<tool file="filters/uniq.xml" />
146+
</section>
147+
<!-- <section id="motif_tools" name="Motif Tools">
148+
<tool file="meme/meme.xml" hidden="True" />
149+
<tool file="meme/fimo.xml" hidden="True" />
150+
</section> -->
151+
<section id="visualization" name="Visualization">
152+
<tool file="plotting/bar_chart.xml" />
153+
<tool file="plotting/boxplot.xml" />
154+
<!-- <tool file="maf/vcf_to_maf_customtrack.xml" /> -->
155+
</section>
156+
</toolbox>

files/usegalaxy.cz/all_tools.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ items:
1818
- join__subtract_and_group
1919
- convert
2020
- convert_formats
21+
- builtin_converters
2122
- id: genomic_manip_label
2223
text: Genomic File Manipulation
2324
type: label

galaxy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
group: "{{ galaxy_user_group_name }}"
216216
mode: '0600'
217217
tags: cron
218-
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz']"
218+
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz', 'galaxy-umsa.grid.cesnet.cz']"
219219
no_log: true
220220

221221
- name: Copy user - group association script
@@ -243,7 +243,7 @@
243243
group: "{{ galaxy_user_group_name }}"
244244
mode: '0755'
245245
tags: cron
246-
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz']"
246+
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz', 'galaxy-umsa.grid.cesnet.cz']"
247247
- name: Template tool installation cron script
248248
ansible.builtin.template:
249249
src: "{{ playbook_dir }}/templates/galaxy/cron/install_tools.sh.j2"
@@ -252,7 +252,7 @@
252252
group: "{{ galaxy_user_group_name }}"
253253
mode: '0755'
254254
tags: cron
255-
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz']"
255+
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz', 'galaxy-umsa.grid.cesnet.cz']"
256256
- name: Schedule tool installation script using cron
257257
ansible.builtin.cron:
258258
name: "Install tool updates"
@@ -261,7 +261,7 @@
261261
hour: "3" # 3 am daily
262262
job: "/bin/bash -c 'URL={{ inventory_hostname }} API_KEY=$(cat /home/{{ galaxy_user_name }}/.galaxy_api_key) {{ galaxy_root }}/cron/tools/install_tools.sh 2>&1 | logger -t tool_install'"
263263
tags: cron
264-
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz']"
264+
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz', 'usegalaxy.cz', 'galaxy-umsa.grid.cesnet.cz']"
265265

266266
- name: RE Galaxy instance patch in lib/galaxy/webapps/galaxy/api/job_files.py
267267
replace:

0 commit comments

Comments
 (0)