annotate toolfactory/rgToolFactory2.py @ 111:223b78754735 draft

Uploaded
author fubar
date Sun, 29 Nov 2020 07:51:53 +0000
parents ab2474035f81
children 5509dc4c1cf2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
84
5304cda01f60 Uploaded
fubar
parents: 83
diff changeset
1 # replace with shebang for biocontainer
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
2 # see https://github.com/fubar2/toolfactory
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
3 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
4 # copyright ross lazarus (ross stop lazarus at gmail stop com) May 2012
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
5 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
6 # all rights reserved
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
7 # Licensed under the LGPL
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
8 # suggestions for improvement and bug fixes welcome at
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
9 # https://github.com/fubar2/toolfactory
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
10 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
11 # July 2020: BCC was fun and I feel like rip van winkle after 5 years.
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
12 # Decided to
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
13 # 1. Fix the toolfactory so it works - done for simplest case
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
14 # 2. Fix planemo so the toolfactory function works
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
15 # 3. Rewrite bits using galaxyxml functions where that makes sense - done
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
16 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
17 # removed all the old complications including making the new tool use this same script
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
18 # galaxyxml now generates the tool xml https://github.com/hexylena/galaxyxml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
19 # No support for automatic HTML file creation from arbitrary outputs
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
20 # essential problem is to create two command lines - one for the tool xml and a different
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
21 # one to run the executable with the supplied test data and settings
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
22 # Be simpler to write the tool, then run it with planemo and soak up the test outputs.
95
6d122fd54cd0 Uploaded
fubar
parents: 91
diff changeset
23 # well well. sh run_tests.sh --id rgtf2 --report_file tool_tests_tool_conf.html functional.test_toolbox
6d122fd54cd0 Uploaded
fubar
parents: 91
diff changeset
24 # does the needful. Use GALAXY_TEST_SAVE /foo to save outputs - only the tar.gz - not the rest sadly
6d122fd54cd0 Uploaded
fubar
parents: 91
diff changeset
25 # GALAXY_TEST_NO_CLEANUP GALAXY_TEST_TMP_DIR=wherever
99
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
26 # planemo test --engine docker_galaxy --test_data ./test-data/ --docker_extra_volume ./test-data rgToolFactory2.xml
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
27
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
28 import argparse
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
29 import copy
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
30 import datetime
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
31 import grp
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
32 import json
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
33 import logging
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
34 import os
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
35 import re
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
36 import shutil
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
37 import subprocess
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
38 import sys
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
39 import tarfile
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
40 import tempfile
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
41 import time
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
42
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
43
100
c749364c2283 Uploaded
fubar
parents: 99
diff changeset
44 from bioblend import ConnectionError
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
45 from bioblend import toolshed
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
46
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
47 import docker
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
48
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
49 import galaxyxml.tool as gxt
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
50 import galaxyxml.tool.parameters as gxtp
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
51
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
52 import lxml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
53
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
54 import yaml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
55
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
56 myversion = "V2.1 July 2020"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
57 verbose = True
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
58 debug = True
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
59 toolFactoryURL = "https://github.com/fubar2/toolfactory"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
60 ourdelim = "~~~"
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
61 ALOT = 10000000 # srsly. command or test overrides use read() so just in case
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
62 STDIOXML = """<stdio>
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
63 <exit_code range="100:" level="debug" description="shite happens" />
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
64 </stdio>"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
65
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
66 # --input_files="$intab.input_files~~~$intab.input_CL~~~$intab.input_formats\
223b78754735 Uploaded
fubar
parents: 110
diff changeset
67 #~~~$intab.input_label~~~$intab.input_help"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
68 IPATHPOS = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
69 ICLPOS = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
70 IFMTPOS = 2
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
71 ILABPOS = 3
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
72 IHELPOS = 4
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
73 IOCLPOS = 5
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
74
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
75 # --output_files "$otab.history_name~~~$otab.history_format~~~$otab.history_CL~~~$otab.history_test"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
76 ONAMEPOS = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
77 OFMTPOS = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
78 OCLPOS = 2
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
79 OTESTPOS = 3
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
80 OOCLPOS = 4
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
81
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
82
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
83 # --additional_parameters="$i.param_name~~~$i.param_value~~~
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
84 # $i.param_label~~~$i.param_help~~~$i.param_type~~~$i.CL~~~i$.param_CLoverride"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
85 ANAMEPOS = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
86 AVALPOS = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
87 ALABPOS = 2
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
88 AHELPPOS = 3
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
89 ATYPEPOS = 4
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
90 ACLPOS = 5
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
91 AOVERPOS = 6
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
92 AOCLPOS = 7
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
93
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
94
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
95 foo = len(lxml.__version__)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
96 # fug you, flake8. Say my name!
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
97 FAKEEXE = "~~~REMOVE~~~ME~~~"
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
98 # need this until a PR/version bump to fix galaxyxml prepending the exe even
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
99 # with override.
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
100
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
101
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
102 def timenow():
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
103 """return current time as a string"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
104 return time.strftime("%d/%m/%Y %H:%M:%S", time.localtime(time.time()))
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
105
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
106
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
107 def quote_non_numeric(s):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
108 """return a prequoted string for non-numerics
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
109 useful for perl and Rscript parameter passing?
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
110 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
111 try:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
112 _ = float(s)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
113 return s
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
114 except ValueError:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
115 return '"%s"' % s
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
116
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
117
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
118 html_escape_table = {"&": "&amp;", ">": "&gt;", "<": "&lt;", "$": r"\$","#":"&#35;", "$":"&#36;"}
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
119 cheetah_escape_table = {"$": "\$","#":"\#"}
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
120
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
121 def html_escape(text):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
122 """Produce entities within text."""
110
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
123 return "".join([html_escape_table.get(c, c) for c in text])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
124
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
125 def cheetah_escape(text):
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
126 """Produce entities within text."""
110
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
127 return "".join([cheetah_escape_table.get(c, c) for c in text])
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
128
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
129
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
130 def html_unescape(text):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
131 """Revert entities within text. Multiple character targets so use replace"""
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
132 t = text.replace("&amp;", "&")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
133 t = t.replace("&gt;", ">")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
134 t = t.replace("&lt;", "<")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
135 t = t.replace("\\$", "$")
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
136 t = t.replace("&#36;","$")
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
137 t = t.replace("&#35;","#")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
138 return t
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
139
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
140
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
141 def parse_citations(citations_text):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
142 """"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
143 citations = [c for c in citations_text.split("**ENTRY**") if c.strip()]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
144 citation_tuples = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
145 for citation in citations:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
146 if citation.startswith("doi"):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
147 citation_tuples.append(("doi", citation[len("doi") :].strip()))
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
148 else:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
149 citation_tuples.append(("bibtex", citation[len("bibtex") :].strip()))
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
150 return citation_tuples
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
151
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
152
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
153 class ScriptRunner:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
154 """Wrapper for an arbitrary script
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
155 uses galaxyxml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
156
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
157 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
158
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
159 def __init__(self, args=None):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
160 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
161 prepare command line cl for running the tool here
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
162 and prepare elements needed for galaxyxml tool generation
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
163 """
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
164 self.ourcwd = os.getcwd()
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
165 self.ourenv = copy.deepcopy(os.environ)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
166 self.infiles = [x.split(ourdelim) for x in args.input_files]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
167 self.outfiles = [x.split(ourdelim) for x in args.output_files]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
168 self.addpar = [x.split(ourdelim) for x in args.additional_parameters]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
169 self.args = args
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
170 self.cleanuppar()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
171 self.lastclredirect = None
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
172 self.lastxclredirect = None
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
173 self.cl = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
174 self.xmlcl = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
175 self.is_positional = self.args.parampass == "positional"
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
176 if self.args.sysexe:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
177 self.executeme = self.args.sysexe
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
178 else:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
179 if self.args.packages:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
180 self.executeme = self.args.packages.split(",")[0].split(":")[0]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
181 else:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
182 self.executeme = None
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
183 aCL = self.cl.append
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
184 aXCL = self.xmlcl.append
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
185 assert args.parampass in [
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
186 "0",
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
187 "argparse",
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
188 "positional",
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
189 ], 'args.parampass must be "0","positional" or "argparse"'
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
190 self.tool_name = re.sub("[^a-zA-Z0-9_]+", "", args.tool_name)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
191 self.tool_id = self.tool_name
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
192 self.newtool = gxt.Tool(
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
193 self.tool_name,
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
194 self.tool_id,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
195 self.args.tool_version,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
196 self.args.tool_desc,
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
197 FAKEEXE,
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
198 )
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
199 self.newtarpath = "toolfactory_%s.tgz" % self.tool_name
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
200 self.tooloutdir = "./tfout"
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
201 self.repdir = "./TF_run_report_tempdir"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
202 self.testdir = os.path.join(self.tooloutdir, "test-data")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
203 if not os.path.exists(self.tooloutdir):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
204 os.mkdir(self.tooloutdir)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
205 if not os.path.exists(self.testdir):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
206 os.mkdir(self.testdir) # make tests directory
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
207 if not os.path.exists(self.repdir):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
208 os.mkdir(self.repdir)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
209 self.tinputs = gxtp.Inputs()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
210 self.toutputs = gxtp.Outputs()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
211 self.testparam = []
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
212 if self.args.script_path:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
213 self.prepScript()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
214 if self.args.command_override:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
215 scos = open(self.args.command_override, "r").readlines()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
216 self.command_override = [x.rstrip() for x in scos]
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
217 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
218 self.command_override = None
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
219 if self.args.test_override:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
220 stos = open(self.args.test_override, "r").readlines()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
221 self.test_override = [x.rstrip() for x in stos]
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
222 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
223 self.test_override = None
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
224 if self.args.cl_prefix: # DIY CL start
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
225 clp = self.args.cl_prefix.split(" ")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
226 for c in clp:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
227 aCL(c)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
228 aXCL(c)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
229 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
230 if self.args.script_path:
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
231 aCL(self.executeme)
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
232 aCL(self.sfile)
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
233 aXCL(self.executeme)
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
234 aXCL("$runme")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
235 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
236 aCL(self.executeme) # this little CL will just run
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
237 aXCL(self.executeme)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
238 self.elog = os.path.join(self.repdir, "%s_error_log.txt" % self.tool_name)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
239 self.tlog = os.path.join(self.repdir, "%s_runner_log.txt" % self.tool_name)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
240
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
241 if self.args.parampass == "0":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
242 self.clsimple()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
243 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
244 clsuffix = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
245 xclsuffix = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
246 for i, p in enumerate(self.infiles):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
247 if p[IOCLPOS] == "STDIN":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
248 appendme = [
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
249 p[IOCLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
250 p[ICLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
251 p[IPATHPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
252 "< %s" % p[IPATHPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
253 ]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
254 xappendme = [
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
255 p[IOCLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
256 p[ICLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
257 p[IPATHPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
258 "< $%s" % p[ICLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
259 ]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
260 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
261 appendme = [p[IOCLPOS], p[ICLPOS], p[IPATHPOS], ""]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
262 xappendme = [p[IOCLPOS], p[ICLPOS], "$%s" % p[ICLPOS], ""]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
263 clsuffix.append(appendme)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
264 xclsuffix.append(xappendme)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
265 for i, p in enumerate(self.outfiles):
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
266 if p[OCLPOS] == "STDOUT":
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
267 self.lastclredirect = [">", p[ONAMEPOS]]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
268 self.lastxclredirect = [">", "$%s" % p[OCLPOS]]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
269 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
270 clsuffix.append([p[OOCLPOS], p[OCLPOS], p[ONAMEPOS], ""])
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
271 xclsuffix.append([p[OOCLPOS], p[OCLPOS], "$%s" % p[ONAMEPOS], ""])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
272 for p in self.addpar:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
273 clsuffix.append([p[AOCLPOS], p[ACLPOS], p[AVALPOS], p[AOVERPOS]])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
274 xclsuffix.append(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
275 [p[AOCLPOS], p[ACLPOS], '"$%s"' % p[ANAMEPOS], p[AOVERPOS]]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
276 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
277 clsuffix.sort()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
278 xclsuffix.sort()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
279 self.xclsuffix = xclsuffix
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
280 self.clsuffix = clsuffix
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
281 if self.args.parampass == "positional":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
282 self.clpositional()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
283 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
284 self.clargparse()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
285
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
286 def prepScript(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
287 rx = open(self.args.script_path, "r").readlines()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
288 rx = [x.rstrip() for x in rx]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
289 rxcheck = [x.strip() for x in rx if x.strip() > ""]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
290 assert len(rxcheck) > 0, "Supplied script is empty. Cannot run"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
291 self.script = "\n".join(rx)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
292 fhandle, self.sfile = tempfile.mkstemp(
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
293 prefix=self.tool_name, suffix="_%s" % (self.executeme)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
294 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
295 tscript = open(self.sfile, "w")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
296 tscript.write(self.script)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
297 tscript.close()
109
0116bfe0fa5e Uploaded
fubar
parents: 108
diff changeset
298 self.escapedScript = [cheetah_escape(x) for x in rx]
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
299 self.spacedScript = [f" {x}" for x in rx]
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
300 art = "%s.%s" % (self.tool_name, self.executeme)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
301 artifact = open(art, "wb")
110
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
302 artifact.write(bytes('\n'.join(self.escapedScript),'utf8'))
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
303 artifact.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
304
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
305 def cleanuppar(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
306 """ positional parameters are complicated by their numeric ordinal"""
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
307 for i, p in enumerate(self.infiles):
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
308 infp = copy.copy(p)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
309 if self.args.parampass == "positional":
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
310 assert infp[
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
311 ICLPOS
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
312 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
313 infp[ICLPOS],
223b78754735 Uploaded
fubar
parents: 110
diff changeset
314 infp[ILABPOS],
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
315 )
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
316 icl = infp[ICLPOS]
223b78754735 Uploaded
fubar
parents: 110
diff changeset
317 infp.append(icl)
223b78754735 Uploaded
fubar
parents: 110
diff changeset
318 if infp[ICLPOS].isdigit() or self.args.parampass == "0":
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
319 scl = "input%d" % (i + 1)
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
320 infp[ICLPOS] = scl
223b78754735 Uploaded
fubar
parents: 110
diff changeset
321 self.infiles[i] = infp
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
322 for i, p in enumerate(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
323 self.outfiles
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
324 ):
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
325 if self.args.parampass == "positional" and p[OCLPOS] != "STDOUT":
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
326 assert p[
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
327 OCLPOS
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
328 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
329 p[OCLPOS],
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
330 p[ONAMEPOS],
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
331 )
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
332 p.append(p[OCLPOS]) # keep copy
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
333 if p[OCLPOS].isdigit() or p[OCLPOS] == "STDOUT":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
334 scl = p[ONAMEPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
335 p[OCLPOS] = scl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
336 self.outfiles[i] = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
337 for i, p in enumerate(self.addpar):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
338 if self.args.parampass == "positional":
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
339 assert p[
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
340 ACLPOS
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
341 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
342 p[ACLPOS],
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
343 p[ANAMEPOS],
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
344 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
345 p.append(p[ACLPOS])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
346 if p[ACLPOS].isdigit():
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
347 scl = "input%s" % p[ACLPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
348 p[ACLPOS] = scl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
349 self.addpar[i] = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
350
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
351 def clsimple(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
352 """no parameters - uses < and > for i/o"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
353 aCL = self.cl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
354 aXCL = self.xmlcl.append
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
355
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
356 if len(self.infiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
357 aCL("<")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
358 aCL(self.infiles[0][IPATHPOS])
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
359 aXCL("<")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
360 aXCL("$%s" % self.infiles[0][ICLPOS])
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
361 if len(self.outfiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
362 aCL(">")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
363 aCL(self.outfiles[0][OCLPOS])
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
364 aXCL(">")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
365 aXCL("$%s" % self.outfiles[0][ONAMEPOS])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
366
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
367 def clpositional(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
368 # inputs in order then params
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
369 aCL = self.cl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
370 for (o_v, k, v, koverride) in self.clsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
371 if " " in v:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
372 aCL("%s" % v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
373 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
374 aCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
375 aXCL = self.xmlcl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
376 for (o_v, k, v, koverride) in self.xclsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
377 aXCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
378 if self.lastxclredirect:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
379 aXCL(self.lastxclredirect[0])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
380 aXCL(self.lastxclredirect[1])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
381
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
382 def clargparse(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
383 """argparse style"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
384 aCL = self.cl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
385 aXCL = self.xmlcl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
386 # inputs then params in argparse named form
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
387 for (o_v, k, v, koverride) in self.xclsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
388 if koverride > "":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
389 k = koverride
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
390 elif len(k.strip()) == 1:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
391 k = "-%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
392 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
393 k = "--%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
394 aXCL(k)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
395 aXCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
396 for (o_v, k, v, koverride) in self.clsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
397 if koverride > "":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
398 k = koverride
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
399 elif len(k.strip()) == 1:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
400 k = "-%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
401 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
402 k = "--%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
403 aCL(k)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
404 aCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
405
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
406 def getNdash(self, newname):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
407 if self.is_positional:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
408 ndash = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
409 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
410 ndash = 2
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
411 if len(newname) < 2:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
412 ndash = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
413 return ndash
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
414
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
415 def doXMLparam(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
416 """flake8 made me do this..."""
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
417 for p in self.outfiles: # --output_files "$otab.history_name~~~$otab.history_format~~~$otab.history_CL~~~$otab.history_test"
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
418 newname, newfmt, newcl, test, oldcl = p
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
419 test = test.strip()
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
420 ndash = self.getNdash(newcl)
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
421 aparm = gxtp.OutputData(name=newname, format=newfmt, num_dashes=ndash, label=newcl)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
422 aparm.positional = self.is_positional
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
423 if self.is_positional:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
424 if oldcl == "STDOUT":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
425 aparm.positional = 9999999
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
426 aparm.command_line_override = "> $%s" % newname
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
427 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
428 aparm.positional = int(oldcl)
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
429 aparm.command_line_override = "$%s" % newname
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
430 self.toutputs.append(aparm)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
431 ld = None
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
432 if test.strip() > "":
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
433 if test.startswith("diff"):
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
434 c = "diff"
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
435 ld = 0
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
436 if test.split(":")[1].isdigit:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
437 ld = int(test.split(":")[1])
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
438 tp = gxtp.TestOutput(
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
439 name=newcl,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
440 value="%s_sample" % newcl,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
441 format=newfmt,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
442 compare= c,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
443 lines_diff=ld,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
444 )
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
445 elif test.startswith("sim_size"):
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
446 c = "sim_size"
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
447 tn = test.split(":")[1].strip()
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
448 if tn > '':
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
449 if '.' in tn:
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
450 delta = None
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
451 delta_frac = min(1.0,float(tn))
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
452 else:
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
453 delta = int(tn)
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
454 delta_frac = None
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
455 tp = gxtp.TestOutput(
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
456 name=newcl,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
457 value="%s_sample" % newcl,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
458 format=newfmt,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
459 compare= c,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
460 delta = delta,
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
461 delta_frac = delta_frac
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
462 )
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
463 self.testparam.append(tp)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
464 for p in self.infiles:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
465 newname = p[ICLPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
466 newfmt = p[IFMTPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
467 ndash = self.getNdash(newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
468 if not len(p[ILABPOS]) > 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
469 alab = p[ICLPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
470 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
471 alab = p[ILABPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
472 aninput = gxtp.DataParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
473 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
474 optional=False,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
475 label=alab,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
476 help=p[IHELPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
477 format=newfmt,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
478 multiple=False,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
479 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
480 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
481 aninput.positional = self.is_positional
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
482 self.tinputs.append(aninput)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
483 tparm = gxtp.TestParam(name=newname, value="%s_sample" % newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
484 self.testparam.append(tparm)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
485 for p in self.addpar:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
486 newname, newval, newlabel, newhelp, newtype, newcl, override, oldcl = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
487 if not len(newlabel) > 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
488 newlabel = newname
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
489 ndash = self.getNdash(newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
490 if newtype == "text":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
491 aparm = gxtp.TextParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
492 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
493 label=newlabel,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
494 help=newhelp,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
495 value=newval,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
496 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
497 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
498 elif newtype == "integer":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
499 aparm = gxtp.IntegerParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
500 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
501 label=newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
502 help=newhelp,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
503 value=newval,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
504 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
505 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
506 elif newtype == "float":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
507 aparm = gxtp.FloatParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
508 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
509 label=newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
510 help=newhelp,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
511 value=newval,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
512 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
513 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
514 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
515 raise ValueError(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
516 'Unrecognised parameter type "%s" for\
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
517 additional parameter %s in makeXML'
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
518 % (newtype, newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
519 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
520 aparm.positional = self.is_positional
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
521 if self.is_positional:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
522 aparm.positional = int(oldcl)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
523 self.tinputs.append(aparm)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
524 tparm = gxtp.TestParam(newname, value=newval)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
525 self.testparam.append(tparm)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
526
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
527 def doNoXMLparam(self):
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
528 """filter style package - stdin to stdout"""
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
529 if len(self.infiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
530 alab = self.infiles[0][ILABPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
531 if len(alab) == 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
532 alab = self.infiles[0][ICLPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
533 max1s = (
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
534 "Maximum one input if parampass is 0 but multiple input files supplied - %s"
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
535 % str(self.infiles)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
536 )
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
537 assert len(self.infiles) == 1, max1s
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
538 newname = self.infiles[0][ICLPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
539 aninput = gxtp.DataParam(
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
540 newname,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
541 optional=False,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
542 label=alab,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
543 help=self.infiles[0][IHELPOS],
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
544 format=self.infiles[0][IFMTPOS],
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
545 multiple=False,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
546 num_dashes=0,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
547 )
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
548 aninput.command_line_override = "< $%s" % newname
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
549 aninput.positional = self.is_positional
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
550 self.tinputs.append(aninput)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
551 tp = gxtp.TestParam(name=newname, value="%s_sample" % newname)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
552 self.testparam.append(tp)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
553 if len(self.outfiles) > 0:
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
554 newname = self.outfiles[0][OCLPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
555 newfmt = self.outfiles[0][OFMTPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
556 anout = gxtp.OutputData(newname, format=newfmt, num_dashes=0)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
557 anout.command_line_override = "> $%s" % newname
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
558 anout.positional = self.is_positional
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
559 self.toutputs.append(anout)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
560 tp = gxtp.TestOutput(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
561 name=newname, value="%s_sample" % newname, format=newfmt
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
562 )
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
563 self.testparam.append(tp)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
564
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
565 def makeXML(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
566 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
567 Create a Galaxy xml tool wrapper for the new script
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
568 Uses galaxyhtml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
569 Hmmm. How to get the command line into correct order...
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
570 """
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
571 if self.command_override:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
572 self.newtool.command_override = self.command_override # config file
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
573 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
574 self.newtool.command_override = self.xmlcl
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
575 if self.args.help_text:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
576 helptext = open(self.args.help_text, "r").readlines()
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
577 safertext = "\n".join([cheetah_escape(x) for x in helptext])
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
578 if self.args.script_path:
110
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
579 scr = [x for x in self.spacedScript if x.strip() > ""]
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
580 scr.insert(0,'\n------\n\nScript::\n')
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
581 if len(scr) > 300:
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
582 scr = (
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
583 scr[:100]
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
584 + [">300 lines - stuff deleted", "......"]
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
585 + scr[-100:]
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
586 )
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
587 scr.append('\n')
110
ab2474035f81 Uploaded
fubar
parents: 109
diff changeset
588 safertext = safertext + "\n".join(scr)
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
589 self.newtool.help = safertext
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
590 else:
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
591 self.newtool.help = (
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
592 "Please ask the tool author (%s) for help \
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
593 as none was supplied at tool generation\n"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
594 % (self.args.user_email)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
595 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
596 self.newtool.version_command = None # do not want
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
597 requirements = gxtp.Requirements()
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
598 if self.args.packages:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
599 for d in self.args.packages.split(","):
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
600 if ":" in d:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
601 packg, ver = d.split(":")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
602 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
603 packg = d
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
604 ver = ""
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
605 requirements.append(
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
606 gxtp.Requirement("package", packg.strip(), ver.strip())
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
607 )
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
608 self.newtool.requirements = requirements
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
609 if self.args.parampass == "0":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
610 self.doNoXMLparam()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
611 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
612 self.doXMLparam()
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
613 self.newtool.outputs = self.toutputs
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
614 self.newtool.inputs = self.tinputs
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
615 if self.args.script_path:
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
616 configfiles = gxtp.Configfiles()
109
0116bfe0fa5e Uploaded
fubar
parents: 108
diff changeset
617 configfiles.append(gxtp.Configfile(name="runme", text="\n".join(self.escapedScript)))
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
618 self.newtool.configfiles = configfiles
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
619 tests = gxtp.Tests()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
620 test_a = gxtp.Test()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
621 for tp in self.testparam:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
622 test_a.append(tp)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
623 tests.append(test_a)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
624 self.newtool.tests = tests
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
625 self.newtool.add_comment(
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
626 "Created by %s at %s using the Galaxy Tool Factory."
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
627 % (self.args.user_email, timenow())
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
628 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
629 self.newtool.add_comment("Source in git at: %s" % (toolFactoryURL))
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
630 self.newtool.add_comment(
108
e878bfc6b80c Uploaded
fubar
parents: 107
diff changeset
631 "Cite: Creating re-usable tools from scripts doi:10.1093/bioinformatics/bts573"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
632 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
633 exml0 = self.newtool.export()
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
634 exml = exml0.replace(FAKEEXE, "") # temporary work around until PR accepted
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
635 if (
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
636 self.test_override
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
637 ): # cannot do this inside galaxyxml as it expects lxml objects for tests
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
638 part1 = exml.split("<tests>")[0]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
639 part2 = exml.split("</tests>")[1]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
640 fixed = "%s\n%s\n%s" % (part1, self.test_override, part2)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
641 exml = fixed
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
642 exml = exml.replace('range="1:"', 'range="1000:"')
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
643 xf = open("%s.xml" % self.tool_name, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
644 xf.write(exml)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
645 xf.write("\n")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
646 xf.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
647 # ready for the tarball
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
648
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
649 def run(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
650 """
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
651 generate test outputs by running a command line
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
652 won't work if command or test override in play - planemo is the
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
653 easiest way to generate test outputs for that case so is
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
654 automagically selected
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
655 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
656 scl = " ".join(self.cl)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
657 err = None
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
658 if self.args.parampass != "0":
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
659 if os.path.exists(self.elog):
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
660 ste = open(self.elog, "a")
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
661 else:
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
662 ste = open(self.elog, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
663 if self.lastclredirect:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
664 sto = open(self.lastclredirect[1], "wb") # is name of an output file
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
665 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
666 if os.path.exists(self.tlog):
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
667 sto = open(self.tlog, "a")
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
668 else:
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
669 sto = open(self.tlog, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
670 sto.write(
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
671 "## Executing Toolfactory generated command line = %s\n" % scl
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
672 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
673 sto.flush()
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
674 subp = subprocess.run(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
675 self.cl, env=self.ourenv, shell=False, stdout=sto, stderr=ste
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
676 )
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
677 sto.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
678 ste.close()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
679 retval = subp.returncode
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
680 else: # work around special case - stdin and write to stdout
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
681 if len(self.infiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
682 sti = open(self.infiles[0][IPATHPOS], "rb")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
683 else:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
684 sti = sys.stdin
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
685 if len(self.outfiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
686 sto = open(self.outfiles[0][ONAMEPOS], "wb")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
687 else:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
688 sto = sys.stdout
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
689 subp = subprocess.run(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
690 self.cl, env=self.ourenv, shell=False, stdout=sto, stdin=sti
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
691 )
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
692 sto.write("## Executing Toolfactory generated command line = %s\n" % scl)
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
693 retval = subp.returncode
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
694 sto.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
695 sti.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
696 if os.path.isfile(self.tlog) and os.stat(self.tlog).st_size == 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
697 os.unlink(self.tlog)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
698 if os.path.isfile(self.elog) and os.stat(self.elog).st_size == 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
699 os.unlink(self.elog)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
700 if retval != 0 and err: # problem
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
701 sys.stderr.write(err)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
702 logging.debug("run done")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
703 return retval
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
704
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
705 def copy_to_container(self, src, dest, container):
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
706 """Recreate the src directory tree at dest - full path included"""
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
707 idir = os.getcwd()
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
708 workdir = os.path.dirname(src)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
709 os.chdir(workdir)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
710 _, tfname = tempfile.mkstemp(suffix=".tar")
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
711 tar = tarfile.open(tfname, mode="w")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
712 srcb = os.path.basename(src)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
713 tar.add(srcb)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
714 tar.close()
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
715 data = open(tfname, "rb").read()
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
716 container.put_archive(dest, data)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
717 os.unlink(tfname)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
718 os.chdir(idir)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
719
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
720 def copy_from_container(self, src, dest, container):
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
721 """recreate the src directory tree at dest using docker sdk"""
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
722 os.makedirs(dest, exist_ok=True)
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
723 _, tfname = tempfile.mkstemp(suffix=".tar")
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
724 tf = open(tfname, "wb")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
725 bits, stat = container.get_archive(src)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
726 for chunk in bits:
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
727 tf.write(chunk)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
728 tf.close()
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
729 tar = tarfile.open(tfname, "r")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
730 tar.extractall(dest)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
731 tar.close()
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
732 os.unlink(tfname)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
733
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
734 def planemo_biodocker_test(self):
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
735 """planemo currently leaks dependencies if used in the same container and gets unhappy after a
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
736 first successful run. https://github.com/galaxyproject/planemo/issues/1078#issuecomment-731476930
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
737
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
738 Docker biocontainer has planemo with caches filled to save repeated downloads
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
739
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
740
99
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
741 """
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
742
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
743 def prun(container, tout, cl, user="biodocker"):
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
744 rlog = container.exec_run(cl, user=user)
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
745 slogl = str(rlog).split("\\n")
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
746 slog = "\n".join(slogl)
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
747 tout.write(f"## got rlog {slog} from {cl}\n")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
748 if os.path.exists(self.tlog):
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
749 tout = open(self.tlog, "a")
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
750 else:
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
751 tout = open(self.tlog, "w")
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
752 planemoimage = "quay.io/fubar2/planemo-biocontainer"
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
753 xreal = "%s.xml" % self.tool_name
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
754 repname = f"{self.tool_name}_planemo_test_report.html"
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
755 ptestrep_path = os.path.join(self.repdir, repname)
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
756 tool_name = self.tool_name
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
757 client = docker.from_env()
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
758 tvol = client.volumes.create()
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
759 tvolname = tvol.name
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
760 destdir = "/toolfactory/ptest"
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
761 imrep = os.path.join(destdir, repname)
105
373e1f9cb609 Uploaded
fubar
parents: 104
diff changeset
762 # need to keep the container running so sleep a while - we stop and destroy it when we are done
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
763 container = client.containers.run(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
764 planemoimage,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
765 "sleep 30m",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
766 detach=True,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
767 user="biodocker",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
768 volumes={f"{tvolname}": {"bind": "/toolfactory", "mode": "rw"}},
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
769 )
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
770 cl = f"mkdir -p {destdir}"
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
771 prun(container, tout, cl, user="root")
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
772 cl = f"rm -rf {destdir}/*"
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
773 prun(container, tout, cl, user="root")
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
774 ptestpath = os.path.join(destdir, "tfout", xreal)
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
775 self.copy_to_container(self.tooloutdir, destdir, container)
107
18e616939a91 Uploaded
fubar
parents: 106
diff changeset
776 cl = "chown -R biodocker /toolfactory"
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
777 prun(container, tout, cl, user="root")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
778 rlog = container.exec_run(f"ls -la {destdir}")
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
779 ptestcl = f"planemo test --update_test_data --no_cleanup --test_data {destdir}/tfout/test-data --galaxy_root /home/biodocker/galaxy-central {ptestpath}"
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
780 try:
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
781 rlog = container.exec_run(ptestcl)
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
782 except:
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
783 e = sys.exc_info()[0]
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
784 tout.write(f"#### error: {e} from {ptestcl}\n")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
785 # fails - used to generate test outputs
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
786 cl = f"planemo test --test_output {imrep} --no_cleanup --test_data {destdir}/tfout/test-data --galaxy_root /home/biodocker/galaxy-central {ptestpath}"
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
787 try:
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
788 prun(container, tout, cl)
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
789 except:
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
790 pass
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
791 testouts = tempfile.mkdtemp(suffix=None, prefix="tftemp", dir=".")
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
792 self.copy_from_container(destdir, testouts, container)
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
793 src = os.path.join(testouts, "ptest")
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
794 if os.path.isdir(src):
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
795 shutil.copytree(src, ".", dirs_exist_ok=True)
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
796 src = repname
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
797 if os.path.isfile(repname):
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
798 shutil.copyfile(src, ptestrep_path)
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
799 else:
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
800 tout.write(f"No output from run to shutil.copytree in {src}\n")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
801 tout.close()
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
802 container.stop()
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
803 container.remove()
103
2ca51677d6d1 Uploaded
fubar
parents: 102
diff changeset
804 tvol.remove()
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
805 # shutil.rmtree(testouts)
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
806
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
807 def shedLoad(self):
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
808 """
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
809 {'deleted': False,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
810 'description': 'Tools for manipulating data',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
811 'id': '175812cd7caaf439',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
812 'model_class': 'Category',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
813 'name': 'Text Manipulation',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
814 'url': '/api/categories/175812cd7caaf439'}]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
815
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
816
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
817 """
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
818 if os.path.exists(self.tlog):
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
819 sto = open(self.tlog, "a")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
820 else:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
821 sto = open(self.tlog, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
822
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
823 ts = toolshed.ToolShedInstance(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
824 url=self.args.toolshed_url, key=self.args.toolshed_api_key, verify=False
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
825 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
826 repos = ts.repositories.get_repositories()
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
827 rnames = [x.get("name", "?") for x in repos]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
828 rids = [x.get("id", "?") for x in repos]
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
829 tfcat = "ToolFactory generated tools"
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
830 if self.tool_name not in rnames:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
831 tscat = ts.categories.get_categories()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
832 cnames = [x.get("name", "?").strip() for x in tscat]
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
833 cids = [x.get("id", "?") for x in tscat]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
834 catID = None
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
835 if tfcat.strip() in cnames:
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
836 ci = cnames.index(tfcat)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
837 catID = cids[ci]
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
838 res = ts.repositories.create_repository(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
839 name=self.args.tool_name,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
840 synopsis="Synopsis:%s" % self.args.tool_desc,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
841 description=self.args.tool_desc,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
842 type="unrestricted",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
843 remote_repository_url=self.args.toolshed_url,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
844 homepage_url=None,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
845 category_ids=catID,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
846 )
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
847 tid = res.get("id", None)
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
848 sto.write(f"#####create_repository {self.args.tool_name} tid={tid} res={res}\n")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
849 else:
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
850 i = rnames.index(self.tool_name)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
851 tid = rids[i]
100
c749364c2283 Uploaded
fubar
parents: 99
diff changeset
852 try:
c749364c2283 Uploaded
fubar
parents: 99
diff changeset
853 res = ts.repositories.update_repository(
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
854 id=tid, tar_ball_path=self.newtarpath, commit_message=None
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
855 )
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
856 sto.write(f"#####update res id {id} ={res}\n")
100
c749364c2283 Uploaded
fubar
parents: 99
diff changeset
857 except ConnectionError:
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
858 sto.write(
111
223b78754735 Uploaded
fubar
parents: 110
diff changeset
859 "Is the toolshed running and the API key correct? Bioblend shed upload failed\n"
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
860 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
861 sto.close()
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
862
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
863 def eph_galaxy_load(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
864 """load the new tool from the local toolshed after planemo uploads it"""
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
865 if os.path.exists(self.tlog):
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
866 tout = open(self.tlog, "a")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
867 else:
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
868 tout = open(self.tlog, "w")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
869 cll = [
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
870 "shed-tools",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
871 "install",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
872 "-g",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
873 self.args.galaxy_url,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
874 "--latest",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
875 "-a",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
876 self.args.galaxy_api_key,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
877 "--name",
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
878 self.tool_name,
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
879 "--owner",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
880 "fubar",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
881 "--toolshed",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
882 self.args.toolshed_url,
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
883 "--section_label",
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
884 "ToolFactory",
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
885 ]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
886 tout.write("running\n%s\n" % " ".join(cll))
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
887 subp = subprocess.run(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
888 cll, env=self.ourenv, cwd=self.ourcwd, shell=False, stderr=tout, stdout=tout
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
889 )
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
890 tout.write(
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
891 "installed %s - got retcode %d\n" % (self.tool_name, subp.returncode)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
892 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
893 tout.close()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
894 return subp.returncode
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
895
99
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
896 def planemo_shedLoad(self):
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
897 """
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
898 planemo shed_create --shed_target testtoolshed
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
899 planemo shed_init --name=<name>
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
900 --owner=<shed_username>
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
901 --description=<short description>
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
902 [--remote_repository_url=<URL to .shed.yml on github>]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
903 [--homepage_url=<Homepage for tool.>]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
904 [--long_description=<long description>]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
905 [--category=<category name>]*
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
906
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
907
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
908 planemo shed_update --check_diff --shed_target testtoolshed
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
909 """
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
910 if os.path.exists(self.tlog):
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
911 tout = open(self.tlog, "a")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
912 else:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
913 tout = open(self.tlog, "w")
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
914 ts = toolshed.ToolShedInstance(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
915 url=self.args.toolshed_url, key=self.args.toolshed_api_key, verify=False
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
916 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
917 repos = ts.repositories.get_repositories()
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
918 rnames = [x.get("name", "?") for x in repos]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
919 rids = [x.get("id", "?") for x in repos]
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
920 # cat = "ToolFactory generated tools"
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
921 if self.tool_name not in rnames:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
922 cll = [
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
923 "planemo",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
924 "shed_create",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
925 "--shed_target",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
926 "local",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
927 "--owner",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
928 "fubar",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
929 "--name",
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
930 self.tool_name,
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
931 "--shed_key",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
932 self.args.toolshed_api_key,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
933 ]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
934 try:
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
935 subp = subprocess.run(
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
936 cll,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
937 env=self.ourenv,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
938 shell=False,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
939 cwd=self.tooloutdir,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
940 stdout=tout,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
941 stderr=tout,
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
942 )
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
943 except:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
944 pass
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
945 if subp.returncode != 0:
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
946 tout.write("Repository %s exists\n" % self.tool_name)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
947 else:
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
948 tout.write("initiated %s\n" % self.tool_name)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
949 cll = [
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
950 "planemo",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
951 "shed_upload",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
952 "--shed_target",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
953 "local",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
954 "--owner",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
955 "fubar",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
956 "--name",
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
957 self.tool_name,
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
958 "--shed_key",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
959 self.args.toolshed_api_key,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
960 "--tar",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
961 self.newtarpath,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
962 ]
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
963 subp = subprocess.run(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
964 cll, env=self.ourenv, cwd=self.ourcwd, shell=False, stdout=tout, stderr=tout
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
965 )
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
966 tout.write("Ran %s got %d\n" % (" ".join(cll), subp.returncode))
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
967 tout.close()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
968 return subp.returncode
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
969
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
970 def eph_test(self, genoutputs=True):
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
971 """problem getting jobid - ephemeris upload is the job before the one we want - but depends on how many inputs"""
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
972 if os.path.exists(self.tlog):
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
973 tout = open(self.tlog, "a")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
974 else:
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
975 tout = open(self.tlog, "w")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
976 cll = [
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
977 "shed-tools",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
978 "test",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
979 "-g",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
980 self.args.galaxy_url,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
981 "-a",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
982 self.args.galaxy_api_key,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
983 "--name",
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
984 self.tool_name,
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
985 "--owner",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
986 "fubar",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
987 ]
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
988 if genoutputs:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
989 dummy, tfile = tempfile.mkstemp()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
990 subp = subprocess.run(
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
991 cll,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
992 env=self.ourenv,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
993 cwd=self.ourcwd,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
994 shell=False,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
995 stderr=dummy,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
996 stdout=dummy,
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
997 )
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
998
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
999 with open("tool_test_output.json", "rb") as f:
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1000 s = json.loads(f.read())
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1001 print("read %s" % s)
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1002 cl = s["tests"][0]["data"]["job"]["command_line"].split()
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1003 n = cl.index("--script_path")
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1004 jobdir = cl[n + 1]
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1005 jobdir = jobdir.replace('"', "")
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1006 jobdir = jobdir.split("/configs")[0]
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1007 print("jobdir=%s" % jobdir)
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1008
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1009 # "/home/ross/galthrow/database/jobs_directory/000/649/configs/tmptfxu51gs\"
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1010 src = os.path.join(jobdir, "working", self.newtarpath)
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1011 if os.path.exists(src):
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1012 dest = os.path.join(self.testdir, self.newtarpath)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1013 shutil.copyfile(src, dest)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1014 else:
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1015 tout.write(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1016 "No toolshed archive found after first ephemeris test - not a good sign"
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1017 )
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1018 ephouts = os.path.join(jobdir, "working", "tfout", "test-data")
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1019 with os.scandir(ephouts) as outs:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1020 for entry in outs:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1021 if not entry.is_file():
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1022 continue
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1023 dest = os.path.join(self.tooloutdir, entry.name)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1024 src = os.path.join(ephouts, entry.name)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1025 shutil.copyfile(src, dest)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1026 else:
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1027 subp = subprocess.run(
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1028 cll,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1029 env=self.ourenv,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1030 cwd=self.ourcwd,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1031 shell=False,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1032 stderr=tout,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1033 stdout=tout,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1034 )
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1035 tout.write("eph_test Ran %s got %d" % (" ".join(cll), subp.returncode))
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1036 tout.close()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1037 return subp.returncode
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
1038
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1039 def planemo_test_biocontainer(self, genoutputs=True):
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1040 """planemo is a requirement so is available for testing but testing in a biocontainer
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1041 requires some fiddling to use the hacked galaxy-central .venv
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1042
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1043 Planemo runs:
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1044 python ./scripts/functional_tests.py -v --with-nosehtml --html-report-file
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1045 /export/galaxy-central/database/job_working_directory/000/17/working/TF_run_report_tempdir/tacrev_planemo_test_report.html
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1046 --with-xunit --xunit-file /tmp/tmpt90p7f9h/xunit.xml --with-structureddata
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1047 --structured-data-file
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1048 /export/galaxy-central/database/job_working_directory/000/17/working/tfout/tool_test_output.json functional.test_toolbox
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1049
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1050
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1051 for the planemo-biocontainer,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1052 planemo test --conda_dependency_resolution --skip_venv --galaxy_root /galthrow/ rgToolFactory2.xml
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1053
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1054 """
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1055 xreal = "%s.xml" % self.tool_name
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1056 tool_test_path = os.path.join(
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1057 self.repdir, f"{self.tool_name}_planemo_test_report.html"
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1058 )
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1059 if os.path.exists(self.tlog):
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1060 tout = open(self.tlog, "a")
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1061 else:
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1062 tout = open(self.tlog, "w")
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1063 if genoutputs:
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1064 dummy, tfile = tempfile.mkstemp()
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1065 cll = [
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1066 ".",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1067 os.path.join(self.args.galaxy_root, ".venv", "bin", "activate"),
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1068 "&&",
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1069 "planemo",
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1070 "test",
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1071 "--test_data",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1072 self.testdir,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1073 "--test_output",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1074 tool_test_path,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1075 "--skip_venv",
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1076 "--galaxy_root",
91
7176af503cdd Uploaded
fubar
parents: 87
diff changeset
1077 self.args.galaxy_root,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1078 "--update_test_data",
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1079 xreal,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1080 ]
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1081 subp = subprocess.run(
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1082 cll,
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
1083 env=self.ourenv,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1084 shell=False,
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1085 cwd=self.tooloutdir,
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1086 stderr=dummy,
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1087 stdout=dummy,
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1088 )
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1089
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1090 else:
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1091 cll = [
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1092 ".",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1093 os.path.join(self.args.galaxy_root, ".venv", "bin", "activate"),
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1094 "&&",
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1095 "planemo",
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1096 "test",
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1097 "--test_data",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1098 os.path.self.testdir,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1099 "--test_output",
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1100 os.path.tool_test_path,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1101 "--skip_venv",
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1102 "--galaxy_root",
91
7176af503cdd Uploaded
fubar
parents: 87
diff changeset
1103 self.args.galaxy_root,
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1104 xreal,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1105 ]
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1106 subp = subprocess.run(
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1107 cll,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1108 env=self.ourenv,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1109 shell=False,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1110 cwd=self.tooloutdir,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1111 stderr=tout,
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1112 stdout=tout,
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1113 )
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1114 tout.close()
98
67628c7dc9f3 Uploaded
fubar
parents: 97
diff changeset
1115 return subp.returncode
83
48acd0708839 Uploaded
fubar
parents: 81
diff changeset
1116
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1117 def writeShedyml(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1118 """for planemo"""
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1119 yuser = self.args.user_email.split("@")[0]
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1120 yfname = os.path.join(self.tooloutdir, ".shed.yml")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1121 yamlf = open(yfname, "w")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1122 odict = {
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1123 "name": self.tool_name,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1124 "owner": yuser,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1125 "type": "unrestricted",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1126 "description": self.args.tool_desc,
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1127 "synopsis": self.args.tool_desc,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1128 "category": "TF Generated Tools",
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1129 }
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1130 yaml.dump(odict, yamlf, allow_unicode=True)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1131 yamlf.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1132
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1133 def makeTool(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1134 """write xmls and input samples into place"""
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1135 self.makeXML()
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1136 if self.args.script_path:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1137 stname = os.path.join(self.tooloutdir, "%s" % (self.sfile))
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1138 if not os.path.exists(stname):
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1139 shutil.copyfile(self.sfile, stname)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1140 xreal = "%s.xml" % self.tool_name
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1141 xout = os.path.join(self.tooloutdir, xreal)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1142 shutil.copyfile(xreal, xout)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1143 for p in self.infiles:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1144 pth = p[IPATHPOS]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1145 dest = os.path.join(self.testdir, "%s_sample" % p[ICLPOS])
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1146 shutil.copyfile(pth, dest)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1147
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1148 def makeToolTar(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1149 """move outputs into test-data and prepare the tarball"""
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
1150 excludeme = "_planemo_test_report.html"
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1151
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1152 def exclude_function(tarinfo):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1153 filename = tarinfo.name
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1154 return None if filename.endswith(excludeme) else tarinfo
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1155
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1156 for p in self.outfiles:
96
d54976fc996a Uploaded
fubar
parents: 95
diff changeset
1157 oname = p[ONAMEPOS]
99
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1158 tdest = os.path.join(self.testdir, "%s_sample" % oname)
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1159 if not os.path.isfile(tdest):
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1160 src = os.path.join(self.testdir, oname)
99
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1161 if os.path.isfile(src):
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1162 shutil.copyfile(src, tdest)
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1163 dest = os.path.join(self.repdir, "%s.sample" % (oname))
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1164 shutil.copyfile(src, dest)
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1165 else:
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1166 print(
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1167 "### problem - output file %s not found in testdir %s"
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1168 % (tdest, self.testdir)
d4d88d393285 Uploaded
fubar
parents: 98
diff changeset
1169 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1170 tf = tarfile.open(self.newtarpath, "w:gz")
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1171 tf.add(name=self.tooloutdir, arcname=self.tool_name, filter=exclude_function)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1172 tf.close()
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1173 shutil.copyfile(self.newtarpath, self.args.new_tool)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1174
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1175 def moveRunOutputs(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1176 """need to move planemo or run outputs into toolfactory collection"""
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1177 with os.scandir(self.tooloutdir) as outs:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1178 for entry in outs:
80
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1179 if not entry.is_file():
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1180 continue
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1181 if "." in entry.name:
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1182 nayme, ext = os.path.splitext(entry.name)
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1183 if ext in [".yml", ".xml", ".json", ".yaml"]:
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1184 ext = f"{ext}.txt"
80
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1185 else:
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1186 ext = ".txt"
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1187 ofn = "%s%s" % (entry.name.replace(".", "_"), ext)
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1188 dest = os.path.join(self.repdir, ofn)
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1189 src = os.path.join(self.tooloutdir, entry.name)
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1190 shutil.copyfile(src, dest)
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1191 with os.scandir(self.testdir) as outs:
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1192 for entry in outs:
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1193 if (
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1194 (not entry.is_file())
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1195 or entry.name.endswith("_sample")
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1196 or entry.name.endswith("_planemo_test_report.html")
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1197 ):
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1198 continue
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1199 if "." in entry.name:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1200 nayme, ext = os.path.splitext(entry.name)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1201 else:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1202 ext = ".txt"
80
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1203 newname = f"{entry.name}{ext}"
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1204 dest = os.path.join(self.repdir, newname)
f423a77bc669 Uploaded
fubar
parents: 78
diff changeset
1205 src = os.path.join(self.testdir, entry.name)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1206 shutil.copyfile(src, dest)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1207
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1208
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1209 def main():
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1210 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1211 This is a Galaxy wrapper. It expects to be called by a special purpose tool.xml as:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1212 <command interpreter="python">rgBaseScriptWrapper.py --script_path "$scriptPath"
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1213 --tool_name "foo" --interpreter "Rscript"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1214 </command>
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1215 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1216 parser = argparse.ArgumentParser()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1217 a = parser.add_argument
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1218 a("--script_path", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1219 a("--history_test", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1220 a("--cl_prefix", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1221 a("--sysexe", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1222 a("--packages", default=None)
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1223 a("--tool_name", default="newtool")
72
a8764cda9dbf Uploaded
fubar
parents: 69
diff changeset
1224 a("--tool_dir", default=None)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1225 a("--input_files", default=[], action="append")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1226 a("--output_files", default=[], action="append")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1227 a("--user_email", default="Unknown")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1228 a("--bad_user", default=None)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1229 a("--make_Tool", default="runonly")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1230 a("--help_text", default=None)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1231 a("--tool_desc", default=None)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1232 a("--tool_version", default=None)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1233 a("--citations", default=None)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1234 a("--command_override", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1235 a("--test_override", default=None)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1236 a("--additional_parameters", action="append", default=[])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1237 a("--edit_additional_parameters", action="store_true", default=False)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1238 a("--parampass", default="positional")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1239 a("--tfout", default="./tfout")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1240 a("--new_tool", default="new_tool")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1241 a("--galaxy_url", default="http://localhost:8080")
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1242 a("--toolshed_url", default="http://localhost:9009")
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1243 # make sure this is identical to tool_sheds_conf.xml localhost != 127.0.0.1 so validation fails
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
1244 a("--toolshed_api_key", default="fakekey")
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1245 a("--galaxy_api_key", default="fakekey")
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1246 a("--galaxy_root", default="/galaxy-central")
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
1247 a("--galaxy_venv", default="/galaxy_venv")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1248 args = parser.parse_args()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1249 assert not args.bad_user, (
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1250 'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy admin adds %s to "admin_users" in the Galaxy configuration file'
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1251 % (args.bad_user, args.bad_user)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1252 )
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1253 assert args.tool_name, "## Tool Factory expects a tool name - eg --tool_name=DESeq"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1254 assert (
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1255 args.sysexe or args.packages
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1256 ), "## Tool Factory wrapper expects an interpreter or an executable package"
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1257 args.input_files = [x.replace('"', "").replace("'", "") for x in args.input_files]
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1258 # remove quotes we need to deal with spaces in CL params
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1259 for i, x in enumerate(args.additional_parameters):
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1260 args.additional_parameters[i] = args.additional_parameters[i].replace('"', "")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1261 r = ScriptRunner(args)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1262 r.writeShedyml()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1263 r.makeTool()
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1264 if args.make_Tool == "generate":
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1265 retcode = r.run() # for testing toolfactory itself
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1266 r.moveRunOutputs()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1267 r.makeToolTar()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1268 else:
106
6de08f44e551 Uploaded
fubar
parents: 105
diff changeset
1269 r.planemo_biodocker_test() # test to make outputs and then test
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1270 r.moveRunOutputs()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1271 r.makeToolTar()
101
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
1272 if args.make_Tool == "gentestinstall":
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
1273 r.shedLoad()
557d5f06f213 Uploaded
fubar
parents: 100
diff changeset
1274 r.eph_galaxy_load()
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
1275
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1276
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1277 if __name__ == "__main__":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1278 main()