annotate toolfactory/rgToolFactory2.py @ 127:98c8a76b3638 draft

Uploaded
author fubar
date Tue, 30 Mar 2021 00:17:55 +0000
parents def0f754ee1b
children c35ff02652bf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1 # replace with shebang for biocontainer
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
2 # see https://github.com/fubar2/toolfactory
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
3 #
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
4 # copyright ross lazarus (ross stop lazarus at gmail stop com) May 2012
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
5 #
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
6 # all rights reserved
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
7 # Licensed under the LGPL
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
8 # suggestions for improvement and bug fixes welcome at
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
9 # https://github.com/fubar2/toolfactory
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
10 #
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
11 # July 2020: BCC was fun and I feel like rip van winkle after 5 years.
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
12 # Decided to
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
13 # 1. Fix the toolfactory so it works - done for simplest case
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
14 # 2. Fix planemo so the toolfactory function works
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
15 # 3. Rewrite bits using galaxyxml functions where that makes sense - done
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
16
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
17 import argparse
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
18 import copy
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
19 import json
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
20 import logging
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
21 import os
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
22 import re
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
23 import shutil
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
24 import subprocess
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
25 import sys
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
26 import tarfile
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
27 import tempfile
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
28 import time
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
29
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
30
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
31 import galaxyxml.tool as gxt
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
32 import galaxyxml.tool.parameters as gxtp
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
33 import lxml
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
34 import yaml
127
98c8a76b3638 Uploaded
fubar
parents: 126
diff changeset
35 from bioblend import ConnectionError
98c8a76b3638 Uploaded
fubar
parents: 126
diff changeset
36 from bioblend import toolshed
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
37
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
38
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
39 myversion = "V2.2 February 2021"
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
40 verbose = True
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
41 debug = True
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
42 toolFactoryURL = "https://github.com/fubar2/toolfactory"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
43 foo = len(lxml.__version__)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
44 # fug you, flake8. Say my name!
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
45 FAKEEXE = "~~~REMOVE~~~ME~~~"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
46 # need this until a PR/version bump to fix galaxyxml prepending the exe even
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
47 # with override.
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
48
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
49
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
50 def timenow():
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
51 """return current time as a string"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
52 return time.strftime("%d/%m/%Y %H:%M:%S", time.localtime(time.time()))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
53
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
54
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
55 cheetah_escape_table = {"$": "\\$", "#": "\\#"}
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
56
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
57
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
58 def cheetah_escape(text):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
59 """Produce entities within text."""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
60 return "".join([cheetah_escape_table.get(c, c) for c in text])
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
61
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
62
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
63 def parse_citations(citations_text):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
64 """"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
65 citations = [c for c in citations_text.split("**ENTRY**") if c.strip()]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
66 citation_tuples = []
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
67 for citation in citations:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
68 if citation.startswith("doi"):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
69 citation_tuples.append(("doi", citation[len("doi") :].strip()))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
70 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
71 citation_tuples.append(("bibtex", citation[len("bibtex") :].strip()))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
72 return citation_tuples
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
73
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
74
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
75 class ScriptRunner:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
76 """Wrapper for an arbitrary script
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
77 uses galaxyxml
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
78
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
79 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
80
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
81 def __init__(self, args=None):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
82 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
83 prepare command line cl for running the tool here
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
84 and prepare elements needed for galaxyxml tool generation
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
85 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
86 self.ourcwd = os.getcwd()
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
87 self.collections = []
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
88 if len(args.collection) > 0:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
89 try:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
90 self.collections = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
91 json.loads(x) for x in args.collection if len(x.strip()) > 1
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
92 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
93 except Exception:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
94 print(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
95 f"--collections parameter {str(args.collection)} is malformed - should be a dictionary"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
96 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
97 try:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
98 self.infiles = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
99 json.loads(x) for x in args.input_files if len(x.strip()) > 1
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
100 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
101 except Exception:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
102 print(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
103 f"--input_files parameter {str(args.input_files)} is malformed - should be a dictionary"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
104 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
105 try:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
106 self.outfiles = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
107 json.loads(x) for x in args.output_files if len(x.strip()) > 1
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
108 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
109 except Exception:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
110 print(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
111 f"--output_files parameter {args.output_files} is malformed - should be a dictionary"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
112 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
113 try:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
114 self.addpar = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
115 json.loads(x) for x in args.additional_parameters if len(x.strip()) > 1
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
116 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
117 except Exception:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
118 print(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
119 f"--additional_parameters {args.additional_parameters} is malformed - should be a dictionary"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
120 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
121 try:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
122 self.selpar = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
123 json.loads(x) for x in args.selecttext_parameters if len(x.strip()) > 1
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
124 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
125 except Exception:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
126 print(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
127 f"--selecttext_parameters {args.selecttext_parameters} is malformed - should be a dictionary"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
128 )
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
129 self.args = args
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
130 self.cleanuppar()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
131 self.lastclredirect = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
132 self.lastxclredirect = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
133 self.cl = []
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
134 self.xmlcl = []
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
135 self.is_positional = self.args.parampass == "positional"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
136 if self.args.sysexe:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
137 if ' ' in self.args.sysexe:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
138 self.executeme = self.args.sysexe.split(' ')
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
139 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
140 self.executeme = [self.args.sysexe, ]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
141 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
142 if self.args.packages:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
143 self.executeme = [self.args.packages.split(",")[0].split(":")[0].strip(), ]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
144 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
145 self.executeme = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
146 aCL = self.cl.append
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
147 aXCL = self.xmlcl.append
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
148 assert args.parampass in [
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
149 "0",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
150 "argparse",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
151 "positional",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
152 ], 'args.parampass must be "0","positional" or "argparse"'
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
153 self.tool_name = re.sub("[^a-zA-Z0-9_]+", "", args.tool_name)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
154 self.tool_id = self.tool_name
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
155 self.newtool = gxt.Tool(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
156 self.tool_name,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
157 self.tool_id,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
158 self.args.tool_version,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
159 self.args.tool_desc,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
160 FAKEEXE,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
161 )
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
162 self.newtarpath = "%s_toolshed.gz" % self.tool_name
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
163 self.tooloutdir = "./tfout"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
164 self.repdir = "./TF_run_report_tempdir"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
165 self.testdir = os.path.join(self.tooloutdir, "test-data")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
166 if not os.path.exists(self.tooloutdir):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
167 os.mkdir(self.tooloutdir)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
168 if not os.path.exists(self.testdir):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
169 os.mkdir(self.testdir)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
170 if not os.path.exists(self.repdir):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
171 os.mkdir(self.repdir)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
172 self.tinputs = gxtp.Inputs()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
173 self.toutputs = gxtp.Outputs()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
174 self.testparam = []
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
175 if self.args.script_path:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
176 self.prepScript()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
177 if self.args.command_override:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
178 scos = open(self.args.command_override, "r").readlines()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
179 self.command_override = [x.rstrip() for x in scos]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
180 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
181 self.command_override = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
182 if self.args.test_override:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
183 stos = open(self.args.test_override, "r").readlines()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
184 self.test_override = [x.rstrip() for x in stos]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
185 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
186 self.test_override = None
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
187 if self.args.script_path:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
188 for ex in self.executeme:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
189 aCL(ex)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
190 aXCL(ex)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
191 aCL(self.sfile)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
192 aXCL("$runme")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
193 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
194 aCL(self.executeme[0])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
195 aXCL(self.executeme[0])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
196 self.elog = os.path.join(self.repdir, "%s_error_log.txt" % self.tool_name)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
197 self.tlog = os.path.join(self.repdir, "%s_runner_log.txt" % self.tool_name)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
198 if self.args.parampass == "0":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
199 self.clsimple()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
200 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
201 if self.args.parampass == "positional":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
202 self.prepclpos()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
203 self.clpositional()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
204 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
205 self.prepargp()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
206 self.clargparse()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
207 if self.args.cl_prefix: # DIY CL end - misnamed!
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
208 clp = self.args.cl_prefix.split(" ")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
209 for c in clp:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
210 aCL(c)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
211 aXCL(c)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
212
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
213 def clsimple(self):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
214 """no parameters - uses < and > for i/o"""
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
215 aCL = self.cl.append
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
216 aXCL = self.xmlcl.append
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
217 if len(self.infiles) > 0:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
218 aCL("<")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
219 aCL(self.infiles[0]["infilename"])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
220 aXCL("<")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
221 aXCL("$%s" % self.infiles[0]["infilename"])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
222 if len(self.outfiles) > 0:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
223 aCL(">")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
224 aCL(self.outfiles[0]["name"])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
225 aXCL(">")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
226 aXCL("$%s" % self.outfiles[0]["name"])
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
227
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
228 def prepargp(self):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
229 clsuffix = []
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
230 xclsuffix = []
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
231 for i, p in enumerate(self.infiles):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
232 if p["origCL"].strip().upper() == "STDIN":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
233 appendme = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
234 p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
235 p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
236 "< %s" % p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
237 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
238 xappendme = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
239 p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
240 p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
241 "< $%s" % p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
242 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
243 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
244 appendme = [p["CL"], p["CL"], ""]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
245 xappendme = [p["CL"], "$%s" % p["CL"], ""]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
246 clsuffix.append(appendme)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
247 xclsuffix.append(xappendme)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
248 for i, p in enumerate(self.outfiles):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
249 if p["origCL"].strip().upper() == "STDOUT":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
250 self.lastclredirect = [">", p["name"]]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
251 self.lastxclredirect = [">", "$%s" % p["name"]]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
252 else:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
253 clsuffix.append([p["name"], p["name"], ""])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
254 xclsuffix.append([p["name"], "$%s" % p["name"], ""])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
255 for p in self.addpar:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
256 clsuffix.append([p["CL"], p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
257 xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
258 for p in self.selpar:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
259 clsuffix.append([p["CL"], p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
260 xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
261 clsuffix.sort()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
262 xclsuffix.sort()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
263 self.xclsuffix = xclsuffix
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
264 self.clsuffix = clsuffix
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
265
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
266 def prepclpos(self):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
267 clsuffix = []
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
268 xclsuffix = []
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
269 for i, p in enumerate(self.infiles):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
270 if p["origCL"].strip().upper() == "STDIN":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
271 appendme = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
272 "999",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
273 p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
274 "< $%s" % p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
275 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
276 xappendme = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
277 "999",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
278 p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
279 "< $%s" % p["infilename"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
280 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
281 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
282 appendme = [p["CL"], p["infilename"], ""]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
283 xappendme = [p["CL"], "$%s" % p["infilename"], ""]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
284 clsuffix.append(appendme)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
285 xclsuffix.append(xappendme)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
286 for i, p in enumerate(self.outfiles):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
287 if p["origCL"].strip().upper() == "STDOUT":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
288 self.lastclredirect = [">", p["name"]]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
289 self.lastxclredirect = [">", "$%s" % p["name"]]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
290 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
291 clsuffix.append([p["CL"], p["name"], ""])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
292 xclsuffix.append([p["CL"], "$%s" % p["name"], ""])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
293 for p in self.addpar:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
294 clsuffix.append([p["CL"], p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
295 xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
296 for p in self.selpar:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
297 clsuffix.append([p["CL"], p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
298 xclsuffix.append([p["CL"], '"$%s"' % p["name"], p["override"]])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
299 clsuffix.sort()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
300 xclsuffix.sort()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
301 self.xclsuffix = xclsuffix
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
302 self.clsuffix = clsuffix
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
303
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
304 def prepScript(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
305 rx = open(self.args.script_path, "r").readlines()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
306 rx = [x.rstrip() for x in rx]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
307 rxcheck = [x.strip() for x in rx if x.strip() > ""]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
308 assert len(rxcheck) > 0, "Supplied script is empty. Cannot run"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
309 self.script = "\n".join(rx)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
310 fhandle, self.sfile = tempfile.mkstemp(
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
311 prefix=self.tool_name, suffix="_%s" % (self.executeme[0])
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
312 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
313 tscript = open(self.sfile, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
314 tscript.write(self.script)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
315 tscript.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
316 self.escapedScript = [cheetah_escape(x) for x in rx]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
317 self.spacedScript = [f" {x}" for x in rx if x.strip() > ""]
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
318 art = "%s.%s" % (self.tool_name, self.executeme[0])
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
319 artifact = open(art, "wb")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
320 artifact.write(bytes("\n".join(self.escapedScript), "utf8"))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
321 artifact.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
322
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
323 def cleanuppar(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
324 """ positional parameters are complicated by their numeric ordinal"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
325 if self.args.parampass == "positional":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
326 for i, p in enumerate(self.infiles):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
327 assert (
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
328 p["CL"].isdigit() or p["CL"].strip().upper() == "STDIN"
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
329 ), "Positional parameters must be ordinal integers - got %s for %s" % (
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
330 p["CL"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
331 p["label"],
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
332 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
333 for i, p in enumerate(self.outfiles):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
334 assert (
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
335 p["CL"].isdigit() or p["CL"].strip().upper() == "STDOUT"
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
336 ), "Positional parameters must be ordinal integers - got %s for %s" % (
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
337 p["CL"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
338 p["name"],
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
339 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
340 for i, p in enumerate(self.addpar):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
341 assert p[
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
342 "CL"
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
343 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
344 p["CL"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
345 p["name"],
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
346 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
347 for i, p in enumerate(self.infiles):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
348 infp = copy.copy(p)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
349 infp["origCL"] = infp["CL"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
350 if self.args.parampass in ["positional", "0"]:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
351 infp["infilename"] = infp["label"].replace(" ", "_")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
352 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
353 infp["infilename"] = infp["CL"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
354 self.infiles[i] = infp
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
355 for i, p in enumerate(self.outfiles):
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
356 p["origCL"] = p["CL"] # keep copy
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
357 self.outfiles[i] = p
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
358 for i, p in enumerate(self.addpar):
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
359 p["origCL"] = p["CL"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
360 self.addpar[i] = p
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
361
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
362 def clpositional(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
363 # inputs in order then params
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
364 aCL = self.cl.append
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
365 for (k, v, koverride) in self.clsuffix:
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
366 if " " in v:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
367 aCL("%s" % v)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
368 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
369 aCL(v)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
370 aXCL = self.xmlcl.append
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
371 for (k, v, koverride) in self.xclsuffix:
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
372 aXCL(v)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
373 if self.lastxclredirect:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
374 aXCL(self.lastxclredirect[0])
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
375 aXCL(self.lastxclredirect[1])
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
376
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
377 def clargparse(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
378 """argparse style"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
379 aCL = self.cl.append
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
380 aXCL = self.xmlcl.append
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
381 # inputs then params in argparse named form
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
382
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
383 for (k, v, koverride) in self.xclsuffix:
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
384 if koverride > "":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
385 k = koverride
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
386 elif len(k.strip()) == 1:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
387 k = "-%s" % k
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
388 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
389 k = "--%s" % k
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
390 aXCL(k)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
391 aXCL(v)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
392 for (k, v, koverride) in self.clsuffix:
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
393 if koverride > "":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
394 k = koverride
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
395 elif len(k.strip()) == 1:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
396 k = "-%s" % k
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
397 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
398 k = "--%s" % k
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
399 aCL(k)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
400 aCL(v)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
401
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
402 def getNdash(self, newname):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
403 if self.is_positional:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
404 ndash = 0
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
405 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
406 ndash = 2
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
407 if len(newname) < 2:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
408 ndash = 1
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
409 return ndash
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
410
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
411 def doXMLparam(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
412 """flake8 made me do this..."""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
413 for p in self.outfiles:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
414 newname = p["name"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
415 newfmt = p["format"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
416 newcl = p["CL"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
417 test = p["test"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
418 oldcl = p["origCL"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
419 test = test.strip()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
420 ndash = self.getNdash(newcl)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
421 aparm = gxtp.OutputData(
124
f267ed4a3026 Uploaded
fubar
parents: 122
diff changeset
422 name=newname, format=newfmt, num_dashes=ndash, label=newname
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
423 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
424 aparm.positional = self.is_positional
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
425 if self.is_positional:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
426 if oldcl.upper() == "STDOUT":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
427 aparm.positional = 9999999
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
428 aparm.command_line_override = "> $%s" % newname
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
429 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
430 aparm.positional = int(oldcl)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
431 aparm.command_line_override = "$%s" % newname
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
432 self.toutputs.append(aparm)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
433 ld = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
434 if test.strip() > "":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
435 if test.startswith("diff"):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
436 c = "diff"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
437 ld = 0
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
438 if test.split(":")[1].isdigit:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
439 ld = int(test.split(":")[1])
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
440 tp = gxtp.TestOutput(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
441 name=newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
442 value="%s_sample" % newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
443 compare=c,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
444 lines_diff=ld,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
445 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
446 elif test.startswith("sim_size"):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
447 c = "sim_size"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
448 tn = test.split(":")[1].strip()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
449 if tn > "":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
450 if "." in tn:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
451 delta = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
452 delta_frac = min(1.0, float(tn))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
453 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
454 delta = int(tn)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
455 delta_frac = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
456 tp = gxtp.TestOutput(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
457 name=newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
458 value="%s_sample" % newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
459 compare=c,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
460 delta=delta,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
461 delta_frac=delta_frac,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
462 )
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
463 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
464 c = test
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
465 tp = gxtp.TestOutput(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
466 name=newname,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
467 value="%s_sample" % newname,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
468 compare=c,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
469 )
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
470 self.testparam.append(tp)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
471 for p in self.infiles:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
472 newname = p["infilename"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
473 newfmt = p["format"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
474 ndash = self.getNdash(newname)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
475 if not len(p["label"]) > 0:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
476 alab = p["CL"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
477 else:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
478 alab = p["label"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
479 aninput = gxtp.DataParam(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
480 newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
481 optional=False,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
482 label=alab,
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
483 help=p["help"],
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
484 format=newfmt,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
485 multiple=False,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
486 num_dashes=ndash,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
487 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
488 aninput.positional = self.is_positional
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
489 if self.is_positional:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
490 if p["origCL"].upper() == "STDIN":
127
98c8a76b3638 Uploaded
fubar
parents: 126
diff changeset
491 aninput.positional = 9999998
98c8a76b3638 Uploaded
fubar
parents: 126
diff changeset
492 aninput.command_line_override = "> $%s" % newname
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
493 else:
127
98c8a76b3638 Uploaded
fubar
parents: 126
diff changeset
494 aninput.positional = int(p["origCL"])
98c8a76b3638 Uploaded
fubar
parents: 126
diff changeset
495 aninput.command_line_override = "$%s" % newname
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
496 self.tinputs.append(aninput)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
497 tparm = gxtp.TestParam(name=newname, value="%s_sample" % newname)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
498 self.testparam.append(tparm)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
499 for p in self.addpar:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
500 newname = p["name"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
501 newval = p["value"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
502 newlabel = p["label"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
503 newhelp = p["help"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
504 newtype = p["type"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
505 newcl = p["CL"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
506 oldcl = p["origCL"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
507 if not len(newlabel) > 0:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
508 newlabel = newname
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
509 ndash = self.getNdash(newname)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
510 if newtype == "text":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
511 aparm = gxtp.TextParam(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
512 newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
513 label=newlabel,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
514 help=newhelp,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
515 value=newval,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
516 num_dashes=ndash,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
517 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
518 elif newtype == "integer":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
519 aparm = gxtp.IntegerParam(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
520 newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
521 label=newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
522 help=newhelp,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
523 value=newval,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
524 num_dashes=ndash,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
525 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
526 elif newtype == "float":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
527 aparm = gxtp.FloatParam(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
528 newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
529 label=newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
530 help=newhelp,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
531 value=newval,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
532 num_dashes=ndash,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
533 )
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
534 elif newtype == "boolean":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
535 aparm = gxtp.BooleanParam(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
536 newname,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
537 label=newname,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
538 help=newhelp,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
539 value=newval,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
540 num_dashes=ndash,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
541 )
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
542 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
543 raise ValueError(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
544 'Unrecognised parameter type "%s" for\
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
545 additional parameter %s in makeXML'
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
546 % (newtype, newname)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
547 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
548 aparm.positional = self.is_positional
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
549 if self.is_positional:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
550 aparm.positional = int(oldcl)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
551 self.tinputs.append(aparm)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
552 tparm = gxtp.TestParam(newname, value=newval)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
553 self.testparam.append(tparm)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
554 for p in self.selpar:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
555 newname = p["name"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
556 newval = p["value"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
557 newlabel = p["label"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
558 newhelp = p["help"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
559 newtype = p["type"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
560 newcl = p["CL"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
561 if not len(newlabel) > 0:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
562 newlabel = newname
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
563 ndash = self.getNdash(newname)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
564 if newtype == "selecttext":
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
565 newtext = p["texts"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
566 aparm = gxtp.SelectParam(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
567 newname,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
568 label=newlabel,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
569 help=newhelp,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
570 num_dashes=ndash,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
571 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
572 for i in range(len(newval)):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
573 anopt = gxtp.SelectOption(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
574 value=newval[i],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
575 text=newtext[i],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
576 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
577 aparm.append(anopt)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
578 aparm.positional = self.is_positional
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
579 if self.is_positional:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
580 aparm.positional = int(newcl)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
581 self.tinputs.append(aparm)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
582 tparm = gxtp.TestParam(newname, value=newval)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
583 self.testparam.append(tparm)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
584 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
585 raise ValueError(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
586 'Unrecognised parameter type "%s" for\
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
587 selecttext parameter %s in makeXML'
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
588 % (newtype, newname)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
589 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
590 for p in self.collections:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
591 newkind = p["kind"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
592 newname = p["name"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
593 newlabel = p["label"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
594 newdisc = p["discover"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
595 collect = gxtp.OutputCollection(newname, label=newlabel, type=newkind)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
596 disc = gxtp.DiscoverDatasets(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
597 pattern=newdisc, directory=f"{newname}", visible="false"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
598 )
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
599 collect.append(disc)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
600 self.toutputs.append(collect)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
601 tparm = gxtp.TestOutput(newname, ftype="pdf")
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
602 self.testparam.append(tparm)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
603
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
604 def doNoXMLparam(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
605 """filter style package - stdin to stdout"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
606 if len(self.infiles) > 0:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
607 alab = self.infiles[0]["label"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
608 if len(alab) == 0:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
609 alab = self.infiles[0]["infilename"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
610 max1s = (
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
611 "Maximum one input if parampass is 0 but multiple input files supplied - %s"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
612 % str(self.infiles)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
613 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
614 assert len(self.infiles) == 1, max1s
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
615 newname = self.infiles[0]["infilename"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
616 aninput = gxtp.DataParam(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
617 newname,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
618 optional=False,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
619 label=alab,
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
620 help=self.infiles[0]["help"],
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
621 format=self.infiles[0]["format"],
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
622 multiple=False,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
623 num_dashes=0,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
624 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
625 aninput.command_line_override = "< $%s" % newname
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
626 aninput.positional = True
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
627 self.tinputs.append(aninput)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
628 tp = gxtp.TestParam(name=newname, value="%s_sample" % newname)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
629 self.testparam.append(tp)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
630 if len(self.outfiles) > 0:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
631 newname = self.outfiles[0]["name"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
632 newfmt = self.outfiles[0]["format"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
633 anout = gxtp.OutputData(newname, format=newfmt, num_dashes=0)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
634 anout.command_line_override = "> $%s" % newname
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
635 anout.positional = self.is_positional
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
636 self.toutputs.append(anout)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
637 tp = gxtp.TestOutput(name=newname, value="%s_sample" % newname)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
638 self.testparam.append(tp)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
639
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
640 def makeXML(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
641 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
642 Create a Galaxy xml tool wrapper for the new script
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
643 Uses galaxyhtml
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
644 Hmmm. How to get the command line into correct order...
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
645 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
646 if self.command_override:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
647 self.newtool.command_override = self.command_override # config file
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
648 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
649 self.newtool.command_override = self.xmlcl
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
650 cite = gxtp.Citations()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
651 acite = gxtp.Citation(type="doi", value="10.1093/bioinformatics/bts573")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
652 cite.append(acite)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
653 self.newtool.citations = cite
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
654 safertext = ""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
655 if self.args.help_text:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
656 helptext = open(self.args.help_text, "r").readlines()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
657 safertext = "\n".join([cheetah_escape(x) for x in helptext])
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
658 if len(safertext.strip()) == 0:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
659 safertext = (
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
660 "Ask the tool author (%s) to rebuild with help text please\n"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
661 % (self.args.user_email)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
662 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
663 if self.args.script_path:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
664 if len(safertext) > 0:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
665 safertext = safertext + "\n\n------\n" # transition allowed!
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
666 scr = [x for x in self.spacedScript if x.strip() > ""]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
667 scr.insert(0, "\n\nScript::\n")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
668 if len(scr) > 300:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
669 scr = (
122
c763ae9237ca Uploaded
fubar
parents: 121
diff changeset
670 scr[:100]
c763ae9237ca Uploaded
fubar
parents: 121
diff changeset
671 + [" >300 lines - stuff deleted", " ......"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
672 + scr[-100:]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
673 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
674 scr.append("\n")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
675 safertext = safertext + "\n".join(scr)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
676 self.newtool.help = safertext
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
677 self.newtool.version_command = f'echo "{self.args.tool_version}"'
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
678 requirements = gxtp.Requirements()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
679 if self.args.packages:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
680 for d in self.args.packages.split(","):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
681 ver = ""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
682 d = d.replace("==", ":")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
683 d = d.replace("=", ":")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
684 if ":" in d:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
685 packg, ver = d.split(":")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
686 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
687 packg = d
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
688 requirements.append(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
689 gxtp.Requirement("package", packg.strip(), ver.strip())
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
690 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
691 self.newtool.requirements = requirements
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
692 if self.args.parampass == "0":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
693 self.doNoXMLparam()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
694 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
695 self.doXMLparam()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
696 self.newtool.outputs = self.toutputs
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
697 self.newtool.inputs = self.tinputs
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
698 if self.args.script_path:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
699 configfiles = gxtp.Configfiles()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
700 configfiles.append(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
701 gxtp.Configfile(name="runme", text="\n".join(self.escapedScript))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
702 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
703 self.newtool.configfiles = configfiles
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
704 tests = gxtp.Tests()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
705 test_a = gxtp.Test()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
706 for tp in self.testparam:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
707 test_a.append(tp)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
708 tests.append(test_a)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
709 self.newtool.tests = tests
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
710 self.newtool.add_comment(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
711 "Created by %s at %s using the Galaxy Tool Factory."
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
712 % (self.args.user_email, timenow())
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
713 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
714 self.newtool.add_comment("Source in git at: %s" % (toolFactoryURL))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
715 exml0 = self.newtool.export()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
716 exml = exml0.replace(FAKEEXE, "") # temporary work around until PR accepted
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
717 if (
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
718 self.test_override
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
719 ): # cannot do this inside galaxyxml as it expects lxml objects for tests
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
720 part1 = exml.split("<tests>")[0]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
721 part2 = exml.split("</tests>")[1]
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
722 fixed = "%s\n%s\n%s" % (part1, "\n".join(self.test_override), part2)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
723 exml = fixed
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
724 # exml = exml.replace('range="1:"', 'range="1000:"')
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
725 xf = open("%s.xml" % self.tool_name, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
726 xf.write(exml)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
727 xf.write("\n")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
728 xf.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
729 # ready for the tarball
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
730
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
731 def run(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
732 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
733 generate test outputs by running a command line
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
734 won't work if command or test override in play - planemo is the
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
735 easiest way to generate test outputs for that case so is
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
736 automagically selected
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
737 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
738 scl = " ".join(self.cl)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
739 err = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
740 if self.args.parampass != "0":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
741 if os.path.exists(self.elog):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
742 ste = open(self.elog, "a")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
743 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
744 ste = open(self.elog, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
745 if self.lastclredirect:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
746 sto = open(self.lastclredirect[1], "wb") # is name of an output file
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
747 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
748 if os.path.exists(self.tlog):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
749 sto = open(self.tlog, "a")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
750 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
751 sto = open(self.tlog, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
752 sto.write(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
753 "## Executing Toolfactory generated command line = %s\n" % scl
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
754 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
755 sto.flush()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
756 subp = subprocess.run(
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
757 self.cl, shell=False, stdout=sto, stderr=ste
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
758 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
759 sto.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
760 ste.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
761 retval = subp.returncode
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
762 else: # work around special case - stdin and write to stdout
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
763 if len(self.infiles) > 0:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
764 sti = open(self.infiles[0]["name"], "rb")
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
765 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
766 sti = sys.stdin
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
767 if len(self.outfiles) > 0:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
768 sto = open(self.outfiles[0]["name"], "wb")
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
769 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
770 sto = sys.stdout
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
771 subp = subprocess.run(
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
772 self.cl, shell=False, stdout=sto, stdin=sti
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
773 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
774 sto.write("## Executing Toolfactory generated command line = %s\n" % scl)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
775 retval = subp.returncode
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
776 sto.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
777 sti.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
778 if os.path.isfile(self.tlog) and os.stat(self.tlog).st_size == 0:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
779 os.unlink(self.tlog)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
780 if os.path.isfile(self.elog) and os.stat(self.elog).st_size == 0:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
781 os.unlink(self.elog)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
782 if retval != 0 and err: # problem
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
783 sys.stderr.write(err)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
784 logging.debug("run done")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
785 return retval
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
786
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
787 def shedLoad(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
788 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
789 use bioblend to create new repository
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
790 or update existing
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
791
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
792 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
793 if os.path.exists(self.tlog):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
794 sto = open(self.tlog, "a")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
795 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
796 sto = open(self.tlog, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
797
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
798 ts = toolshed.ToolShedInstance(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
799 url=self.args.toolshed_url,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
800 key=self.args.toolshed_api_key,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
801 verify=False,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
802 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
803 repos = ts.repositories.get_repositories()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
804 rnames = [x.get("name", "?") for x in repos]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
805 rids = [x.get("id", "?") for x in repos]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
806 tfcat = "ToolFactory generated tools"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
807 if self.tool_name not in rnames:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
808 tscat = ts.categories.get_categories()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
809 cnames = [x.get("name", "?").strip() for x in tscat]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
810 cids = [x.get("id", "?") for x in tscat]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
811 catID = None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
812 if tfcat.strip() in cnames:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
813 ci = cnames.index(tfcat)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
814 catID = cids[ci]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
815 res = ts.repositories.create_repository(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
816 name=self.args.tool_name,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
817 synopsis="Synopsis:%s" % self.args.tool_desc,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
818 description=self.args.tool_desc,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
819 type="unrestricted",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
820 remote_repository_url=self.args.toolshed_url,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
821 homepage_url=None,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
822 category_ids=catID,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
823 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
824 tid = res.get("id", None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
825 sto.write(f"#create_repository {self.args.tool_name} tid={tid} res={res}\n")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
826 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
827 i = rnames.index(self.tool_name)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
828 tid = rids[i]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
829 try:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
830 res = ts.repositories.update_repository(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
831 id=tid, tar_ball_path=self.newtarpath, commit_message=None
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
832 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
833 sto.write(f"#update res id {id} ={res}\n")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
834 except ConnectionError:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
835 sto.write(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
836 "####### Is the toolshed running and the API key correct? Bioblend shed upload failed\n"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
837 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
838 sto.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
839
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
840 def eph_galaxy_load(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
841 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
842 use ephemeris to load the new tool from the local toolshed after planemo uploads it
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
843 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
844 if os.path.exists(self.tlog):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
845 tout = open(self.tlog, "a")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
846 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
847 tout = open(self.tlog, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
848 cll = [
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
849 "shed-tools",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
850 "install",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
851 "-g",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
852 self.args.galaxy_url,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
853 "--latest",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
854 "-a",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
855 self.args.galaxy_api_key,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
856 "--name",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
857 self.tool_name,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
858 "--owner",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
859 "fubar",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
860 "--toolshed",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
861 self.args.toolshed_url,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
862 "--section_label",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
863 "ToolFactory",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
864 ]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
865 tout.write("running\n%s\n" % " ".join(cll))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
866 subp = subprocess.run(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
867 cll,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
868 cwd=self.ourcwd,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
869 shell=False,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
870 stderr=tout,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
871 stdout=tout,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
872 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
873 tout.write(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
874 "installed %s - got retcode %d\n" % (self.tool_name, subp.returncode)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
875 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
876 tout.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
877 return subp.returncode
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
878
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
879 def writeShedyml(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
880 """for planemo"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
881 yuser = self.args.user_email.split("@")[0]
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
882 yfname = os.path.join(self.tooloutdir, ".shed.yml")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
883 yamlf = open(yfname, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
884 odict = {
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
885 "name": self.tool_name,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
886 "owner": yuser,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
887 "type": "unrestricted",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
888 "description": self.args.tool_desc,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
889 "synopsis": self.args.tool_desc,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
890 "category": "TF Generated Tools",
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
891 }
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
892 yaml.dump(odict, yamlf, allow_unicode=True)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
893 yamlf.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
894
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
895 def makeTool(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
896 """write xmls and input samples into place"""
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
897 if self.args.parampass == 0:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
898 self.doNoXMLparam()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
899 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
900 self.makeXML()
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
901 if self.args.script_path:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
902 stname = os.path.join(self.tooloutdir, self.sfile)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
903 if not os.path.exists(stname):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
904 shutil.copyfile(self.sfile, stname)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
905 xreal = "%s.xml" % self.tool_name
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
906 xout = os.path.join(self.tooloutdir, xreal)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
907 shutil.copyfile(xreal, xout)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
908 for p in self.infiles:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
909 pth = p["name"]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
910 dest = os.path.join(self.testdir, "%s_sample" % p["infilename"])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
911 shutil.copyfile(pth, dest)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
912 dest = os.path.join(self.repdir, "%s_sample" % p["infilename"])
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
913 shutil.copyfile(pth, dest)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
914
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
915 def makeToolTar(self, report_fail=False):
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
916 """move outputs into test-data and prepare the tarball"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
917 excludeme = "_planemo_test_report.html"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
918
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
919 def exclude_function(tarinfo):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
920 filename = tarinfo.name
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
921 return None if filename.endswith(excludeme) else tarinfo
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
922
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
923 if os.path.exists(self.tlog):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
924 tout = open(self.tlog, "a")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
925 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
926 tout = open(self.tlog, "w")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
927 for p in self.outfiles:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
928 oname = p["name"]
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
929 tdest = os.path.join(self.testdir, "%s_sample" % oname)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
930 src = os.path.join(self.testdir, oname)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
931 if not os.path.isfile(tdest):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
932 if os.path.isfile(src):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
933 shutil.copyfile(src, tdest)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
934 dest = os.path.join(self.repdir, "%s.sample" % (oname))
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
935 shutil.copyfile(src, dest)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
936 else:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
937 if report_fail:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
938 tout.write(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
939 "###Tool may have failed - output file %s not found in testdir after planemo run %s."
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
940 % (tdest, self.testdir)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
941 )
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
942 tf = tarfile.open(self.newtarpath, "w:gz")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
943 tf.add(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
944 name=self.tooloutdir,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
945 arcname=self.tool_name,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
946 filter=exclude_function,
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
947 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
948 tf.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
949 shutil.copyfile(self.newtarpath, self.args.new_tool)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
950
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
951 def moveRunOutputs(self):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
952 """need to move planemo or run outputs into toolfactory collection"""
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
953 with os.scandir(self.tooloutdir) as outs:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
954 for entry in outs:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
955 if not entry.is_file():
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
956 continue
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
957 if "." in entry.name:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
958 _, ext = os.path.splitext(entry.name)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
959 if ext in [".tgz", ".json"]:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
960 continue
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
961 if ext in [".yml", ".xml", ".yaml"]:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
962 newname = f"{entry.name.replace('.','_')}.txt"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
963 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
964 newname = entry.name
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
965 else:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
966 newname = f"{entry.name}.txt"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
967 dest = os.path.join(self.repdir, newname)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
968 src = os.path.join(self.tooloutdir, entry.name)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
969 shutil.copyfile(src, dest)
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
970 if self.args.include_tests:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
971 with os.scandir(self.testdir) as outs:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
972 for entry in outs:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
973 if (not entry.is_file()) or entry.name.endswith(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
974 "_planemo_test_report.html"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
975 ):
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
976 continue
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
977 if "." in entry.name:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
978 _, ext = os.path.splitext(entry.name)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
979 if ext in [".tgz", ".json"]:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
980 continue
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
981 if ext in [".yml", ".xml", ".yaml"]:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
982 newname = f"{entry.name.replace('.','_')}.txt"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
983 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
984 newname = entry.name
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
985 else:
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
986 newname = f"{entry.name}.txt"
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
987 dest = os.path.join(self.repdir, newname)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
988 src = os.path.join(self.testdir, entry.name)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
989 shutil.copyfile(src, dest)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
990
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
991 def planemo_test_once(self):
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
992 """planemo is a requirement so is available for testing but needs a
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
993 different call if in the biocontainer - see above
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
994 and for generating test outputs if command or test overrides are
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
995 supplied test outputs are sent to repdir for display
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
996 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
997 xreal = "%s.xml" % self.tool_name
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
998 tool_test_path = os.path.join(
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
999 self.repdir, f"{self.tool_name}_planemo_test_report.html"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1000 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1001 if os.path.exists(self.tlog):
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1002 tout = open(self.tlog, "a")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1003 else:
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1004 tout = open(self.tlog, "w")
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1005 cll = [
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1006 "planemo",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1007 "test",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1008 "--conda_auto_init",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1009 "--test_data",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1010 os.path.abspath(self.testdir),
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1011 "--test_output",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1012 os.path.abspath(tool_test_path),
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1013 "--galaxy_root",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1014 self.args.galaxy_root,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1015 "--update_test_data",
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1016 os.path.abspath(xreal),
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1017 ]
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1018 p = subprocess.run(
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1019 cll,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1020 shell=False,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1021 cwd=self.tooloutdir,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1022 stderr=tout,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1023 stdout=tout,
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1024 )
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1025 tout.close()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1026 return p.returncode
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1027
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1028
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1029 def main():
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1030 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1031 This is a Galaxy wrapper.
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1032 It expects to be called by a special purpose tool.xml
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1033
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1034 """
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1035 parser = argparse.ArgumentParser()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1036 a = parser.add_argument
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1037 a("--script_path", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1038 a("--history_test", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1039 a("--cl_prefix", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1040 a("--sysexe", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1041 a("--packages", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1042 a("--tool_name", default="newtool")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1043 a("--tool_dir", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1044 a("--input_files", default=[], action="append")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1045 a("--output_files", default=[], action="append")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1046 a("--user_email", default="Unknown")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1047 a("--bad_user", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1048 a("--make_Tool", default="runonly")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1049 a("--help_text", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1050 a("--tool_desc", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1051 a("--tool_version", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1052 a("--citations", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1053 a("--command_override", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1054 a("--test_override", default=None)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1055 a("--additional_parameters", action="append", default=[])
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1056 a("--selecttext_parameters", action="append", default=[])
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1057 a("--edit_additional_parameters", action="store_true", default=False)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1058 a("--parampass", default="positional")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1059 a("--tfout", default="./tfout")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1060 a("--new_tool", default="new_tool")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1061 a("--galaxy_url", default="http://localhost:8080")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1062 a("--toolshed_url", default="http://localhost:9009")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1063 # make sure this is identical to tool_sheds_conf.xml
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1064 # localhost != 127.0.0.1 so validation fails
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1065 a("--toolshed_api_key", default="fakekey")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1066 a("--galaxy_api_key", default="fakekey")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1067 a("--galaxy_root", default="/galaxy-central")
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1068 a("--galaxy_venv", default="/galaxy_venv")
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1069 a("--collection", action="append", default=[])
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1070 a("--include_tests", default=False, action="store_true")
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1071 args = parser.parse_args()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1072 assert not args.bad_user, (
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1073 'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy \
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1074 admin adds %s to "admin_users" in the galaxy.yml Galaxy configuration file'
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1075 % (args.bad_user, args.bad_user)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1076 )
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1077 assert args.tool_name, "## Tool Factory expects a tool name - eg --tool_name=DESeq"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1078 assert (
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1079 args.sysexe or args.packages
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1080 ), "## Tool Factory wrapper expects an interpreter \
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1081 or an executable package in --sysexe or --packages"
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1082 r = ScriptRunner(args)
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1083 r.writeShedyml()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1084 r.makeTool()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1085 if args.make_Tool == "generate":
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1086 r.run()
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1087 r.moveRunOutputs()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1088 r.makeToolTar()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1089 else:
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1090 # r.planemo_test(genoutputs=True) # this fails :( - see PR
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1091 # r.moveRunOutputs()
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1092 # r.makeToolTar(report_fail=False)
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1093 r.planemo_test_once()
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1094 r.moveRunOutputs()
126
def0f754ee1b Uploaded
fubar
parents: 124
diff changeset
1095 r.makeToolTar(report_fail=True)
121
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1096 if args.make_Tool == "gentestinstall":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1097 r.shedLoad()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1098 r.eph_galaxy_load()
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1099
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1100
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1101 if __name__ == "__main__":
2050b2475ae5 Uploaded
fubar
parents:
diff changeset
1102 main()