# HG changeset patch # User mvdbeek # Date 1443875679 14400 # Node ID 0fa46413d0d92932186dd5d79b941454d0215768 planemo upload for repository https://bitbucket.org/mvdbeek/dockertoolfactory/ commit 2f33eb59c06ac3d6ba6e22622fd4ae729eb5e4da-dirty diff -r 000000000000 -r 0fa46413d0d9 DockerToolFactory.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DockerToolFactory.py Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,773 @@ +# DockerToolFactory.py +# see https://bitbucket.org/mvdbeek/DockerToolFactory + +import sys +import shutil +import subprocess +import os +import time +import tempfile +import argparse +import tarfile +import re +import shutil +import math +import fileinput +from os.path import abspath + +progname = os.path.split(sys.argv[0])[1] +myversion = 'V001.1 March 2014' +verbose = False +debug = False +toolFactoryURL = 'https://bitbucket.org/fubar/galaxytoolfactory' + +# if we do html we need these dependencies specified in a tool_dependencies.xml file and referred to in the generated +# tool xml +toolhtmldepskel = """ + + + + + + + + + + + docker-py==0.4.0 + + + + + + %s + + +""" + +protorequirements = """ + ghostscript + graphicsmagick + toolfactory/custombuild:%s +""" + + +def timenow(): + """return current time as a string + """ + return time.strftime('%d/%m/%Y %H:%M:%S', time.localtime(time.time())) + + +html_escape_table = { + "&": "&", + ">": ">", + "<": "<", + "$": "\$" +} + + +def html_escape(text): + """Produce entities within text.""" + return "".join(html_escape_table.get(c, c) for c in text) + + +def cmd_exists(cmd): + return subprocess.call("type " + cmd, shell=True, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0 + + +def edit_dockerfile(dockerfile): + '''we have to change the userid of galaxy inside the container to the id with which the tool is run, + otherwise we have a mismatch in the file permissions inside the container''' + uid = os.getuid() + for line in fileinput.FileInput(dockerfile, inplace=1): + sys.stdout.write(re.sub("RUN adduser galaxy.*", "RUN adduser galaxy -u {0}\n".format(uid), line)) + + +# TODO: try to download image it it exists. +def build_docker(dockerfile, docker_client, image_tag='base'): + '''Given the path to a dockerfile, and a docker_client, try to build the image, if it does not + exist yet.''' + image_id = 'toolfactory/custombuild:' + image_tag + existing_images = ", ".join(["".join(d['RepoTags']) for d in docker_client.images()]) + if image_id in existing_images: + print 'docker container exists, skipping build' + return image_id + print "Building Docker image, using Dockerfile:{0}".format(dockerfile) + build_process = docker_client.build(fileobj=open(dockerfile, 'r'), tag=image_id) + print "succesfully dispatched docker build process, building now" + build_log = [line for line in build_process] # will block until image is built. + return image_id + + +def construct_bind(host_path, container_path=False, binds=None, ro=True): + # TODO remove container_path if it's alwyas going to be the same as host_path + '''build or extend binds dictionary with container path. binds is used + to mount all files using the docker-py client.''' + if not binds: + binds = {} + if isinstance(host_path, list): + for k, v in enumerate(host_path): + if not container_path: + container_path = host_path[k] + binds[host_path[k]] = {'bind': container_path, 'ro': ro} + container_path = False # could be more elegant + return binds + else: + if not container_path: + container_path = host_path + binds[host_path] = {'bind': container_path, 'ro': ro} + return binds + + +def exists_boot2docker(): + ''' + Try to see if boot2docker command is available. + If it is, run boot2docker shellinit + ''' + return cmd_exists('boot2docker') + + +def boot2docker_shellinit(): + ''' + ''' + cmd = "eval \"\$(boot2docker shellinit)\"" + subprocess.call(cmd, shell=True) + + +def switch_to_docker(opts): + import docker # need local import, as container does not have docker-py + if exists_boot2docker(): + boot2docker_shellinit() + from docker.utils import kwargs_from_env + kwargs = kwargs_from_env() + kwargs['tls'].assert_hostname = False + docker_client = docker.Client(**kwargs) + else: + docker_client = docker.Client() + toolfactory_path = abspath(sys.argv[0]) + dockerfile = os.path.dirname(toolfactory_path) + '/Dockerfile' + edit_dockerfile(dockerfile) + image_id = build_docker(dockerfile, docker_client) + binds = construct_bind(host_path=opts.script_path, ro=False) + binds = construct_bind(binds=binds, host_path=abspath(opts.output_dir), ro=False) + if len(opts.input_tab) > 0: + binds = construct_bind(binds=binds, host_path=opts.input_tab, ro=True) + if not opts.output_tab == 'None': + binds = construct_bind(binds=binds, host_path=opts.output_tab, ro=False) + if opts.make_HTML: + binds = construct_bind(binds=binds, host_path=opts.output_html, ro=False) + if opts.make_Tool: + binds = construct_bind(binds=binds, host_path=opts.new_tool, ro=False) + binds = construct_bind(binds=binds, host_path=opts.help_text, ro=True) + binds = construct_bind(binds=binds, host_path=toolfactory_path) + volumes = binds.keys() + sys.argv = [abspath(opts.output_dir) if sys.argv[i - 1] == '--output_dir' else arg for i, arg in + enumerate(sys.argv)] ##inject absolute path of working_dir + cmd = ['python', '-u'] + sys.argv + ['--dockerized', '1'] + container = docker_client.create_container( + image=image_id, + user=os.getuid(), + volumes=volumes, + command=cmd + ) + docker_client.start(container=container[u'Id'], binds=binds) + docker_client.wait(container=container[u'Id']) + logs = docker_client.logs(container=container[u'Id']) + print "".join([log for log in logs]) + + +class ScriptRunner: + """class is a wrapper for an arbitrary script + """ + + def __init__(self, opts=None, treatbashSpecial=True, image_tag='base'): + """ + cleanup inputs, setup some outputs + + """ + self.opts = opts + self.useGM = cmd_exists('gm') + self.useIM = cmd_exists('convert') + self.useGS = cmd_exists('gs') + self.temp_warned = False # we want only one warning if $TMP not set + self.treatbashSpecial = treatbashSpecial + self.image_tag = image_tag + os.chdir(abspath(opts.output_dir)) + self.thumbformat = 'png' + self.toolname_sanitized = re.sub('[^a-zA-Z0-9_]+', '_', opts.tool_name) # a sanitizer now does this but.. + self.toolname = opts.tool_name + self.toolid = self.toolname + self.myname = sys.argv[0] # get our name because we write ourselves out as a tool later + self.pyfile = self.myname # crude but efficient - the cruft won't hurt much + self.xmlfile = '%s.xml' % self.toolname_sanitized + s = open(self.opts.script_path, 'r').readlines() + s = [x.rstrip() for x in s] # remove pesky dos line endings if needed + self.script = '\n'.join(s) + fhandle, self.sfile = tempfile.mkstemp(prefix=self.toolname_sanitized, suffix=".%s" % (opts.interpreter)) + tscript = open(self.sfile, 'w') # use self.sfile as script source for Popen + tscript.write(self.script) + tscript.close() + self.indentedScript = '\n'.join([' %s' % html_escape(x) for x in s]) # for restructured text in help + self.escapedScript = '\n'.join([html_escape(x) for x in s]) + self.elog = os.path.join(self.opts.output_dir, "%s_error.log" % self.toolname_sanitized) + if opts.output_dir: # may not want these complexities + self.tlog = os.path.join(self.opts.output_dir, "%s_runner.log" % self.toolname_sanitized) + art = '%s.%s' % (self.toolname_sanitized, opts.interpreter) + artpath = os.path.join(self.opts.output_dir, art) # need full path + artifact = open(artpath, 'w') # use self.sfile as script source for Popen + artifact.write(self.script) + artifact.close() + self.cl = [] + self.html = [] + a = self.cl.append + a(opts.interpreter) + if self.treatbashSpecial and opts.interpreter in ['bash', 'sh']: + a(self.sfile) + else: + a('-') # stdin + for input in opts.input_tab: + a(input) + if opts.output_tab == 'None': # If tool generates only HTML, set output name to toolname + a(str(self.toolname_sanitized) + '.out') + a(opts.output_tab) + for param in opts.additional_parameters: + param, value = param.split(',') + a('--' + param) + a(value) + # print self.cl + self.outFormats = opts.output_format + self.inputFormats = [formats for formats in opts.input_formats] + self.test1Input = '%s_test1_input.xls' % self.toolname_sanitized + self.test1Output = '%s_test1_output.xls' % self.toolname_sanitized + self.test1HTML = '%s_test1_output.html' % self.toolname_sanitized + + def makeXML(self): + """ + Create a Galaxy xml tool wrapper for the new script as a string to write out + fixme - use templating or something less fugly than this example of what we produce + + + a tabular file + + reverse.py --script_path "$runMe" --interpreter "python" + --tool_name "reverse" --input_tab "$input1" --output_tab "$tab_file" + + + + + + + + + + + +**What it Does** + +Reverse the columns in a tabular file + + + + + +# reverse order of columns in a tabular file +import sys +inp = sys.argv[1] +outp = sys.argv[2] +i = open(inp,'r') +o = open(outp,'w') +for row in i: + rs = row.rstrip().split('\t') + rs.reverse() + o.write('\t'.join(rs)) + o.write('\n') +i.close() +o.close() + + + + + + + """ + newXML = """ +%(tooldesc)s +%(requirements)s + +%(command)s + + +%(inputs)s + + +%(outputs)s + + + +%(script)s + + + +%(tooltests)s + + + +%(help)s + + +""" # needs a dict with toolname, toolname_sanitized, toolid, interpreter, scriptname, command, inputs as a multi line string ready to write, outputs ditto, help ditto + + newCommand = """ + %(toolname_sanitized)s.py --script_path "$runMe" --interpreter "%(interpreter)s" + --tool_name "%(toolname)s" %(command_inputs)s %(command_outputs)s """ + # may NOT be an input or htmlout - appended later + tooltestsTabOnly = """ + + + + + + + + """ + tooltestsHTMLOnly = """ + + + + + + + + """ + tooltestsBoth = """ + + + + + + + + """ + xdict = {} + # xdict['requirements'] = '' + # if self.opts.make_HTML: + xdict['requirements'] = protorequirements % self.image_tag + xdict['tool_version'] = self.opts.tool_version + xdict['test1Input'] = self.test1Input + xdict['test1HTML'] = self.test1HTML + xdict['test1Output'] = self.test1Output + if self.opts.make_HTML and self.opts.output_tab <> 'None': + xdict['tooltests'] = tooltestsBoth % xdict + elif self.opts.make_HTML: + xdict['tooltests'] = tooltestsHTMLOnly % xdict + else: + xdict['tooltests'] = tooltestsTabOnly % xdict + xdict['script'] = self.escapedScript + # configfile is least painful way to embed script to avoid external dependencies + # but requires escaping of <, > and $ to avoid Mako parsing + if self.opts.help_text: + helptext = open(self.opts.help_text, 'r').readlines() + helptext = [html_escape(x) for x in helptext] # must html escape here too - thanks to Marius van den Beek + xdict['help'] = ''.join([x for x in helptext]) + else: + xdict['help'] = 'Please ask the tool author (%s) for help as none was supplied at tool generation\n' % ( + self.opts.user_email) + coda = ['**Script**', + 'Pressing execute will run the following code over your input file and generate some outputs in your history::'] + coda.append('\n') + coda.append(self.indentedScript) + coda.append('\n**Attribution**\nThis Galaxy tool was created by %s at %s\nusing the Galaxy Tool Factory.\n' % ( + self.opts.user_email, timenow())) + coda.append('See %s for details of that project' % (toolFactoryURL)) + coda.append( + 'Please cite: Creating re-usable tools from scripts: The Galaxy Tool Factory. Ross Lazarus; Antony Kaspi; Mark Ziemann; The Galaxy Team. ') + coda.append('Bioinformatics 2012; doi: 10.1093/bioinformatics/bts573\n') + xdict['help'] = '%s\n%s' % (xdict['help'], '\n'.join(coda)) + if self.opts.tool_desc: + xdict['tooldesc'] = '%s' % self.opts.tool_desc + else: + xdict['tooldesc'] = '' + xdict['command_outputs'] = '' + xdict['outputs'] = '' + if self.opts.input_tab <> 'None': + xdict['command_inputs'] = '--input_tab' + xdict['inputs'] = '' + for i, input in enumerate(self.inputFormats): + xdict[ + 'inputs'] += ' \n'.format( + i + 1, input) + xdict['command_inputs'] += ' $input{0}'.format(i + 1) + else: + xdict['command_inputs'] = '' # assume no input - eg a random data generator + xdict['inputs'] = '' + # I find setting the job name not very logical. can be changed in workflows anyway. xdict['inputs'] += ' \n' % self.toolname + xdict['toolname'] = self.toolname + xdict['toolname_sanitized'] = self.toolname_sanitized + xdict['toolid'] = self.toolid + xdict['interpreter'] = self.opts.interpreter + xdict['scriptname'] = self.sfile + if self.opts.make_HTML: + xdict[ + 'command_outputs'] += ' --output_dir "$html_file.files_path" --output_html "$html_file" --make_HTML "yes"' + xdict['outputs'] += ' \n' + else: + xdict['command_outputs'] += ' --output_dir "./"' + # print self.opts.output_tab + if self.opts.output_tab != "None": + xdict['command_outputs'] += ' --output_tab "$tab_file"' + xdict['outputs'] += ' \n' % self.outFormats + xdict['command'] = newCommand % xdict + # print xdict['outputs'] + xmls = newXML % xdict + xf = open(self.xmlfile, 'w') + xf.write(xmls) + xf.write('\n') + xf.close() + # ready for the tarball + + def makeTooltar(self): + """ + a tool is a gz tarball with eg + /toolname_sanitized/tool.xml /toolname_sanitized/tool.py /toolname_sanitized/test-data/test1_in.foo ... + """ + retval = self.run() + if retval: + print >> sys.stderr, '## Run failed. Cannot build yet. Please fix and retry' + sys.exit(1) + tdir = self.toolname_sanitized + os.mkdir(tdir) + self.makeXML() + if self.opts.make_HTML: + if self.opts.help_text: + hlp = open(self.opts.help_text, 'r').read() + else: + hlp = 'Please ask the tool author for help as none was supplied at tool generation\n' + if self.opts.include_dependencies: + tooldepcontent = toolhtmldepskel % hlp + depf = open(os.path.join(tdir, 'tool_dependencies.xml'), 'w') + depf.write(tooldepcontent) + depf.write('\n') + depf.close() + if self.opts.input_tab <> 'None': # no reproducible test otherwise? TODO: maybe.. + testdir = os.path.join(tdir, 'test-data') + os.mkdir(testdir) # make tests directory + for i in self.opts.input_tab: + # print i + shutil.copyfile(i, os.path.join(testdir, self.test1Input)) + if not self.opts.output_tab: + shutil.copyfile(self.opts.output_tab, os.path.join(testdir, self.test1Output)) + if self.opts.make_HTML: + shutil.copyfile(self.opts.output_html, os.path.join(testdir, self.test1HTML)) + if self.opts.output_dir: + shutil.copyfile(self.tlog, os.path.join(testdir, 'test1_out.log')) + outpif = '%s.py' % self.toolname_sanitized # new name + outpiname = os.path.join(tdir, outpif) # path for the tool tarball + pyin = os.path.basename(self.pyfile) # our name - we rewrite ourselves (TM) + notes = ['# %s - a self annotated version of %s generated by running %s\n' % (outpiname, pyin, pyin), ] + notes.append('# to make a new Galaxy tool called %s\n' % self.toolname) + notes.append('# User %s at %s\n' % (self.opts.user_email, timenow())) + pi = [line.replace('if opts.dockerized==0:', 'if False:') for line in + open(self.pyfile)] # do not run docker in the generated tool + notes += pi + outpi = open(outpiname, 'w') + outpi.write(''.join(notes)) + outpi.write('\n') + outpi.close() + stname = os.path.join(tdir, self.sfile) + if not os.path.exists(stname): + shutil.copyfile(self.sfile, stname) + xtname = os.path.join(tdir, self.xmlfile) + if not os.path.exists(xtname): + shutil.copyfile(self.xmlfile, xtname) + tarpath = "%s.gz" % self.toolname_sanitized + tar = tarfile.open(tarpath, "w:gz") + tar.add(tdir, arcname=self.toolname_sanitized) + tar.close() + shutil.copyfile(tarpath, self.opts.new_tool) + shutil.rmtree(tdir) + ## TODO: replace with optional direct upload to local toolshed? + return retval + + def compressPDF(self, inpdf=None, thumbformat='png'): + """need absolute path to pdf + note that GS gets confoozled if no $TMP or $TEMP + so we set it + """ + assert os.path.isfile(inpdf), "## Input %s supplied to %s compressPDF not found" % (inpdf, self.myName) + hlog = os.path.join(self.opts.output_dir, "compress_%s.txt" % os.path.basename(inpdf)) + sto = open(hlog, 'a') + our_env = os.environ.copy() + our_tmp = our_env.get('TMP', None) + if not our_tmp: + our_tmp = our_env.get('TEMP', None) + if not (our_tmp and os.path.exists(our_tmp)): + newtmp = os.path.join(self.opts.output_dir, 'tmp') + try: + os.mkdir(newtmp) + except: + sto.write('## WARNING - cannot make %s - it may exist or permissions need fixing\n' % newtmp) + our_env['TEMP'] = newtmp + if not self.temp_warned: + sto.write('## WARNING - no $TMP or $TEMP!!! Please fix - using %s temporarily\n' % newtmp) + self.temp_warned = True + outpdf = '%s_compressed' % inpdf + cl = ["gs", "-sDEVICE=pdfwrite", "-dNOPAUSE", "-dUseCIEColor", "-dBATCH", "-dPDFSETTINGS=/printer", + "-sOutputFile=%s" % outpdf, inpdf] + x = subprocess.Popen(cl, stdout=sto, stderr=sto, cwd=self.opts.output_dir, env=our_env) + retval1 = x.wait() + sto.close() + if retval1 == 0: + os.unlink(inpdf) + shutil.move(outpdf, inpdf) + os.unlink(hlog) + hlog = os.path.join(self.opts.output_dir, "thumbnail_%s.txt" % os.path.basename(inpdf)) + sto = open(hlog, 'w') + outpng = '%s.%s' % (os.path.splitext(inpdf)[0], thumbformat) + if self.useGM: + cl2 = ['gm', 'convert', inpdf, outpng] + else: # assume imagemagick + cl2 = ['convert', inpdf, outpng] + x = subprocess.Popen(cl2, stdout=sto, stderr=sto, cwd=self.opts.output_dir, env=our_env) + retval2 = x.wait() + sto.close() + if retval2 == 0: + os.unlink(hlog) + retval = retval1 or retval2 + return retval + + def getfSize(self, fpath, outpath): + """ + format a nice file size string + """ + size = '' + fp = os.path.join(outpath, fpath) + if os.path.isfile(fp): + size = '0 B' + n = float(os.path.getsize(fp)) + if n > 2 ** 20: + size = '%1.1f MB' % (n / 2 ** 20) + elif n > 2 ** 10: + size = '%1.1f KB' % (n / 2 ** 10) + elif n > 0: + size = '%d B' % (int(n)) + return size + + def makeHtml(self): + """ Create an HTML file content to list all the artifacts found in the output_dir + """ + + galhtmlprefix = """ + + + + + + + +
+ """ + galhtmlattr = """
This tool (%s) was generated by the Galaxy Tool Factory

""" + galhtmlpostfix = """
\n""" + + flist = os.listdir(self.opts.output_dir) + flist = [x for x in flist if x <> 'Rplots.pdf'] + flist.sort() + html = [] + html.append(galhtmlprefix % progname) + html.append('
Galaxy Tool "%s" run at %s

' % (self.toolname, timenow())) + fhtml = [] + if len(flist) > 0: + logfiles = [x for x in flist if x.lower().endswith('.log')] # log file names determine sections + logfiles.sort() + logfiles = [x for x in logfiles if abspath(x) <> abspath(self.tlog)] + logfiles.append(abspath(self.tlog)) # make it the last one + pdflist = [] + npdf = len([x for x in flist if os.path.splitext(x)[-1].lower() == '.pdf']) + for rownum, fname in enumerate(flist): + dname, e = os.path.splitext(fname) + sfsize = self.getfSize(fname, self.opts.output_dir) + if e.lower() == '.pdf': # compress and make a thumbnail + thumb = '%s.%s' % (dname, self.thumbformat) + pdff = os.path.join(self.opts.output_dir, fname) + retval = self.compressPDF(inpdf=pdff, thumbformat=self.thumbformat) + if retval == 0: + pdflist.append((fname, thumb)) + else: + pdflist.append((fname, fname)) + if (rownum + 1) % 2 == 0: + fhtml.append( + '%s%s' % (fname, fname, sfsize)) + else: + fhtml.append('%s%s' % (fname, fname, sfsize)) + for logfname in logfiles: # expect at least tlog - if more + if abspath(logfname) == abspath(self.tlog): # handled later + sectionname = 'All tool run' + if (len(logfiles) > 1): + sectionname = 'Other' + ourpdfs = pdflist + else: + realname = os.path.basename(logfname) + sectionname = os.path.splitext(realname)[0].split('_')[0] # break in case _ added to log + ourpdfs = [x for x in pdflist if os.path.basename(x[0]).split('_')[0] == sectionname] + pdflist = [x for x in pdflist if os.path.basename(x[0]).split('_')[0] <> sectionname] # remove + nacross = 1 + npdf = len(ourpdfs) + + if npdf > 0: + nacross = math.sqrt(npdf) ## int(round(math.log(npdf,2))) + if int(nacross) ** 2 != npdf: + nacross += 1 + nacross = int(nacross) + width = min(400, int(1200 / nacross)) + html.append('
%s images and outputs
' % sectionname) + html.append('(Click on a thumbnail image to download the corresponding original PDF image)
') + ntogo = nacross # counter for table row padding with empty cells + html.append('
\n') + for i, paths in enumerate(ourpdfs): + fname, thumb = paths + s = """\n""" % (fname, thumb, fname, width, fname) + if ((i + 1) % nacross == 0): + s += '\n' + ntogo = 0 + if i < (npdf - 1): # more to come + s += '' + ntogo = nacross + else: + ntogo -= 1 + html.append(s) + if html[-1].strip().endswith(''): + html.append('
Image called %s
\n') + else: + if ntogo > 0: # pad + html.append(' ' * ntogo) + html.append('\n') + logt = open(logfname, 'r').readlines() + logtext = [x for x in logt if x.strip() > ''] + html.append('
%s log output
' % sectionname) + if len(logtext) > 1: + html.append('\n
\n')
+                    html += logtext
+                    html.append('\n
\n') + else: + html.append('%s is empty
' % logfname) + if len(fhtml) > 0: + fhtml.insert(0, + '
\n') + fhtml.append('
Output File Name (click to view)Size

') + html.append('
All output files available for downloading
\n') + html += fhtml # add all non-pdf files to the end of the display + else: + html.append( + '
### Error - %s returned no files - please confirm that parameters are sane
' % self.opts.interpreter) + html.append(galhtmlpostfix) + htmlf = file(self.opts.output_html, 'w') + htmlf.write('\n'.join(html)) + htmlf.write('\n') + htmlf.close() + self.html = html + + def run(self): + """ + scripts must be small enough not to fill the pipe! + """ + if self.treatbashSpecial and self.opts.interpreter in ['bash', 'sh']: + retval = self.runBash() + else: + if self.opts.output_dir: + ste = open(self.elog, 'w') + sto = open(self.tlog, 'w') + sto.write('## Toolfactory generated command line = %s\n' % ' '.join(self.cl)) + sto.flush() + p = subprocess.Popen(self.cl, shell=False, stdout=sto, stderr=ste, stdin=subprocess.PIPE, + cwd=self.opts.output_dir) + else: + p = subprocess.Popen(self.cl, shell=False, stdin=subprocess.PIPE) + p.stdin.write(self.script) + p.stdin.close() + retval = p.wait() + if self.opts.output_dir: + sto.close() + ste.close() + err = open(self.elog, 'r').readlines() + if retval <> 0 and err: # problem + print >> sys.stderr, err # same problem, need to capture docker stdin/stdout + if self.opts.make_HTML: + self.makeHtml() + return retval + + def runBash(self): + """ + cannot use - for bash so use self.sfile + """ + if self.opts.output_dir: + s = '## Toolfactory generated command line = %s\n' % ' '.join(self.cl) + sto = open(self.tlog, 'w') + sto.write(s) + sto.flush() + p = subprocess.Popen(self.cl, shell=False, stdout=sto, stderr=sto, cwd=self.opts.output_dir) + else: + p = subprocess.Popen(self.cl, shell=False) + retval = p.wait() + if self.opts.output_dir: + sto.close() + if self.opts.make_HTML: + self.makeHtml() + return retval + + +def main(): + u = """ + This is a Galaxy wrapper. It expects to be called by a special purpose tool.xml as: + rgBaseScriptWrapper.py --script_path "$scriptPath" --tool_name "foo" --interpreter "Rscript" + + """ + op = argparse.ArgumentParser() + a = op.add_argument + a('--script_path', default=None) + a('--tool_name', default=None) + a('--interpreter', default=None) + a('--output_dir', default='./') + a('--output_html', default=None) + a('--input_tab', default='None', nargs='*') + a('--output_tab', default='None') + a('--user_email', default='Unknown') + a('--bad_user', default=None) + a('--make_Tool', default=None) + a('--make_HTML', default=None) + a('--help_text', default=None) + a('--tool_desc', default=None) + a('--new_tool', default=None) + a('--tool_version', default=None) + a('--include_dependencies', default=None) + a('--dockerized', default=0) + a('--output_format', default='tabular') + a('--input_format', dest='input_formats', action='append', default=[]) + a('--additional_parameters', dest='additional_parameters', action='append', default=[]) + opts = op.parse_args() + assert not opts.bad_user, 'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy admin adds %s to admin_users in universe_wsgi.ini' % ( + opts.bad_user, opts.bad_user) + assert opts.tool_name, '## Tool Factory expects a tool name - eg --tool_name=DESeq' + assert opts.interpreter, '## Tool Factory wrapper expects an interpreter - eg --interpreter=Rscript' + assert os.path.isfile(opts.script_path), '## Tool Factory wrapper expects a script path - eg --script_path=foo.R' + if opts.output_dir: + try: + os.makedirs(opts.output_dir) + except: + pass + if opts.dockerized == 0: + switch_to_docker(opts) + return + r = ScriptRunner(opts) + if opts.make_Tool: + retcode = r.makeTooltar() + else: + retcode = r.run() + os.unlink(r.sfile) + if retcode: + sys.exit(retcode) # indicate failure to job runner + + +if __name__ == "__main__": + main() diff -r 000000000000 -r 0fa46413d0d9 DockerToolFactory.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DockerToolFactory.xml Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,206 @@ + + + Makes scripts into tools using Docker + + macros.xml + + + ghostscript + graphicsmagick + docker-py + + + + + $dynScript + + #if $makeMode.make_Tool == "yes": + ${makeMode.help_text} + #end if + + + + + help="Most scripts will need an input - your script MUST be ready for whatever format you choose"/> + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + generate_simple_output['make_TAB'] == "yes" + + + + + + + make_HTML == "yes" + + + makeMode['make_Tool'] == "yes" + + + + + + + + + + + + + + diff -r 000000000000 -r 0fa46413d0d9 Dockerfile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Dockerfile Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,38 @@ +# Toolfactory image +# +# VERSION 0.2 +# This Dockerfile is the base system for executing scripts by the DockerToolFactory. + +FROM toolshed/requirements + +MAINTAINER Marius van den Beek, m.vandenbeek@gmail.com + +# make sure the package repository is up to date +ENV DEBIAN_FRONTEND noninteractive + +#add galaxy user (could be any username). +#1001 will be replaced by the actual user id of the system user +#executing the galaxy tool, so that file write operations are possible. +RUN adduser galaxy -u 1000 + + +ADD adduser.sh /usr/local/bin/adduser.sh +RUN adduser.sh + +RUN ulimit -n 1024 && apt-get update -qq && apt-get install -y --no-install-recommends software-properties-common && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E084DAB9 && add-apt-repository \ +"deb http://cran.irsn.fr/bin/linux/ubuntu trusty/" && apt-get update -qq && apt-get upgrade && apt-get install -y r-base-core r-base-dev \ +adduser zlib1g-dev python-virtualenv python-pip libfreetype6-dev bedtools wget curl \ +libcurl4-openssl-dev libssl-dev libreadline-dev libxml2-dev samtools liblzma-dev \ +libpcre3-dev libbz2-dev + +RUN pip install numpy pysam tornado matplotlib pycurl pip pandas ipython rpy2 + +#RUN Rscript -e 'source("http://bioconductor.org/biocLite.R"); biocLite("DESeq", "DESeq2", "edgeR", "EDASeq")' +#RUN Rscript -e 'install.packages(c("latticeExtra", "ggplot2", "reshape", "gridExtra"), dependencies=TRUE, repos="http://cran.us.r-project.org")' + +RUN mkdir /home/galaxy/job_working_directory +WORKDIR /home/galaxy/job_working_directory +USER galaxy + +#ENTRYPOINT chown -R galaxy /home/galaxy/ && su - galaxy +CMD /bin/bash diff -r 000000000000 -r 0fa46413d0d9 README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.txt Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,311 @@ +# WARNING before you start +# Carefully inspect tool usage. If bugs are found within the tool, users may be able to break +# out of the container and mount files on the host system. + +This is a fork of toolfactory that makes use of Docker to sandbox the generated script. +As such you need to have the system user under which galaxy tools are executed be able to run Docker. +On Ubuntu you can do this by adding your galaxy user to the docker group (http://askubuntu.com/questions/477551/how-can-i-use-docker-without-sudo). +Assuming galaxy runs as the user galaxy, this is the short form for installing Docker from the official docker Ubuntu Trusty repository: + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 +sudo sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list" +sudo apt-get update +sudo apt-get install lxc-docker +sudo gpasswd -a galaxy docker +sudo service docker restart + +Eventually the galaxy process might need to be restarted. + +On OSX, you need to boot2docker installed and available to the galaxy user. + +Note that this could bring severe security problems in case untrusted users can become this user. +If you want to use this tool, read and understand the following article: +https://docs.docker.com/articles/security/#docker-daemon-attack-surface + +Work is ongoing, some important features are missing, like being able to manage containers. +Currently, only a single container with pre-installed tools is available. + +This is an beta-stage, potentially dangerous tool. + +Please cite: + - http://bioinformatics.oxfordjournals.org/cgi/reprint/bts573?ijkey=lczQh1sWrMwdYWJ&keytype=ref + - van den Beek M., Antoniewski C., in preparation +if you use this tool in your published work. + +*Short Story* + +This is an unusual Galaxy tool that exposes unrestricted scripting to users of a Galaxy server, +allowing them to run scripts in R, python, sh and perl over input datasets, +writing a single new data set as output. + +In addition, this tool optionally generates very simple new Galaxy tools, that effectively +freeze the supplied script into a new, ordinary Galaxy tool that runs it over one or more input files, +working just like any other Galaxy tool for your users. + +To use the ToolFactory, you should have prepared a script to paste into a text box, +and a small test input example ready to select from your history to test your new script. +There is an example in each scripting language on the Tool Factory form. You can just +cut and paste these to try it out - remember to select the right interpreter please. You'll +also need to create a small test data set using the Galaxy history add new data tool. + +If the script fails somehow, use the "redo" button on the tool output in your history to +recreate the form complete with broken script. Fix the bug and execute again. Rinse, wash, repeat. + +Once the script runs sucessfully, a new Galaxy tool that runs your script can be generated. +Select the "generate" option and supply some help text and names. The new tool will be +generated in the form of a new Galaxy datatype - toolshed.gz - as the name suggests, +it's an archive ready to upload to a Galaxy ToolShed as a new tool repository. + +Once it's in a ToolShed, it can be installed into any local Galaxy server from +the Galaxy administrative interface. + +Once the new tool is installed, local users can run it - each time, the script that was supplied +when it was built will be executed with the input chosen from the user's history. In other words, +the tools you generate with the ToolFactory run just like any other Galaxy tool, +but run your script every time. + +Tool factory tools are perfect for workflow components. One input, one output, no variables. + +*Reasons to read further* + +If you use Galaxy to support your research; + +You and fellow users are sometimes forced to take data out of Galaxy, process it with ugly +little perl/awk/sed/R... scripts and put it back; + +You do this when you can't do some transformation in Galaxy (the 90/10 rule); + +You don't have enough developer resources for wrapping dozens of even relatively simple tools; + +Your research and your institution would be far better off if those feral scripts were all tucked +safely in your local toolshed and Galaxy histories. + +*The good news* If it can be trivially scripted, it can be running safely in your +local Galaxy via your own local toolshed in a few minutes - with functional tests. + + +*Value proposition* The ToolFactory allows Galaxy to efficiently take over most of your lab's +dark script matter, making it reproducible in Galaxy and shareable through the ToolShed. + +That's what this tool does. You paste a simple script and the tool returns +a new, real Galaxy tool, ready to be installed from the local toolshed to local servers. +Scripts can be wrapped and online literally within minutes. + +*To fully and safely exploit the awesome power* of this tool, Galaxy and the ToolShed, +you should be a developer installing this tool on a private/personal/scratch local instance where you +are an admin_user. Then, if you break it, you get to keep all the pieces +see https://bitbucket.org/fubar/galaxytoolfactory/wiki/Home + +** Installation ** +This is a Galaxy tool. You can install it most conveniently using the administrative "Search and browse tool sheds" link. +Find the Galaxy Test toolshed (not main) and search for the toolfactory repository. +Open it and review the code and select the option to install it. + +If you can't get the tool that way, the xml and py files here need to be copied into a new tools +subdirectory such as tools/toolfactory Your tool_conf.xml needs a new entry pointing to the xml +file - something like:: + +
+ +
+ +If not already there (I just added it to datatypes_conf.xml.sample), please add: + +to your local data_types_conf.xml. + +Ensure that html sanitization is set to False and uncommented in universe_wsgi.ini + +You'll have to restart the server for the new tool to be available. + +R, python, perl are preloaded in the supplied Dockerfile. +Upon first execution the Dockerfile will be used to build an image +with varius pre-installed tools. +Adding new ones should be easy enough, and follows standard conventions +for Docker tools. +Please make suggestions as bitbucket issues and code. +The HTML file code automatically shrinks R's bloated pdfs, and depends on ghostscript. The thumbnails require imagemagick . + +*What it does* This is a tool factory for simple scripts in python, R and perl currently. +Functional tests are automatically generated. +On a technical level, a Docker container is started, and input and output files +are made available to the container. +After running, the docker container will be terminated. + +LIMITED to simple scripts that read inputs from the history. +Optionally can write one new history dataset, and optionally collect any number of outputs into links on an autogenerated HTML +index page for the user to navigate - useful if the script writes images and output files - pdf outputs +are shown as thumbnails and R's bloated pdf's are shrunk with ghostscript so that and imagemagik need to +be avaailable. + +Generated tools can be edited and enhanced like any Galaxy tool, so start small and build up since +a generated script gets you a serious leg up to a more complex one. + +*What you do* You paste and run your script +you fix the syntax errors and eventually it runs +You can use the redo button and edit the script before +trying to rerun it as you debug - it works pretty well. + +Once the script works on some test data, you can +generate a toolshed compatible gzip file +containing your script ready to run as an ordinary Galaxy tool in a +repository on your local toolshed. That means safe and largely automated installation in any +production Galaxy configured to use your toolshed. + +*Generated tool Security* Once you install a generated tool, it's just +another tool - assuming the script is safe. They just run normally and their user cannot do anything unusually insecure +but please, practice safe toolshed. +Read the fucking code before you install any tool. +Especially this one - it is really scary. + +If you opt for an HTML output, you get all the script outputs arranged +as a single Html history item - all output files are linked, thumbnails for all the pdfs. +Ugly but really inexpensive. + +Patches and suggestions welcome as bitbucket issues please? + + +copyright ross lazarus (ross stop lazarus at gmail stop com) May 2012 + +all rights reserved +Licensed under the LGPL if you want to improve it, feel free https://bitbucket.org/fubar/galaxytoolfactory/wiki/Home + +Material for our more enthusiastic and voracious readers continues below - we salute you. + +**Motivation** Simple transformation, filtering or reporting scripts get written, run and lost every day in most busy labs +- even ours where Galaxy is in use. This 'dark script matter' is pervasive and generally not reproducible. + +**Benefits** For our group, this allows Galaxy to fill that important dark script gap - all those "small" bioinformatics +tasks. Once a user has a working R (or python or perl) script that does something Galaxy cannot currently do (eg transpose a +tabular file) and takes parameters the way Galaxy supplies them (see example below), they: + +1. Install the tool factory on a personal private instance + +2. Upload a small test data set + +3. Paste the script into the 'script' text box and iteratively run the insecure tool on test data until it works right - +there is absolutely no reason to do this anywhere other than on a personal private instance. + +4. Once it works right, set the 'Generate toolshed gzip' option and run it again. + +5. A toolshed style gzip appears ready to upload and install like any other Toolshed entry. + +6. Upload the new tool to the toolshed + +7. Ask the local admin to check the new tool to confirm it's not evil and install it in the local production galaxy + +**Simple examples on the tool form** + +A simple Rscript "filter" showing how the command line parameters can be handled, takes an input file, +does something (transpose in this case) and writes the results to a new tabular file:: + + # transpose a tabular input file and write as a tabular output file + ourargs = commandArgs(TRUE) + inf = ourargs[1] + outf = ourargs[2] + inp = read.table(inf,head=F,row.names=NULL,sep='\t') + outp = t(inp) + write.table(outp,outf, quote=FALSE, sep="\t",row.names=F,col.names=F) + +Calculate a multiple test adjusted p value from a column of p values - for this script to be useful, +it needs the right column for the input to be specified in the code for the +given input file type(s) specified when the tool is generated :: + + # use p.adjust - assumes a HEADER row and column 1 - please fix for any real use + column = 1 # adjust if necessary for some other kind of input + fdrmeth = 'BH' + ourargs = commandArgs(TRUE) + inf = ourargs[1] + outf = ourargs[2] + inp = read.table(inf,head=T,row.names=NULL,sep='\t') + p = inp[,column] + q = p.adjust(p,method=fdrmeth) + newval = paste(fdrmeth,'p-value',sep='_') + q = data.frame(q) + names(q) = newval + outp = cbind(inp,newval=q) + write.table(outp,outf, quote=FALSE, sep="\t",row.names=F,col.names=T) + + + +Another Rscript example without any input file - generates a random heatmap pdf - you must make sure the option to create an HTML output file is +turned on for this to work. The heatmap will be presented as a thumbnail linked to the pdf in the resulting HTML page:: + + # note this script takes NO input or output because it generates random data + foo = data.frame(a=runif(100),b=runif(100),c=runif(100),d=runif(100),e=runif(100),f=runif(100)) + bar = as.matrix(foo) + pdf( "heattest.pdf" ) + heatmap(bar,main='Random Heatmap') + dev.off() + +A Python example that reverses each row of a tabular file. You'll need to remove the leading spaces for this to work if cut +and pasted into the script box. Note that you can already do this in Galaxy by setting up the cut columns tool with the +correct number of columns in reverse order,but this script will work for any number of columns so is completely generic:: + +# reverse order of columns in a tabular file +import sys +inp = sys.argv[1] +outp = sys.argv[2] +i = open(inp,'r') +o = open(outp,'w') +for row in i: + rs = row.rstrip().split('\t') + rs.reverse() + o.write('\t'.join(rs)) + o.write('\n') +i.close() +o.close() + + +Galaxy as an IDE for developing API scripts +If you need to develop Galaxy API scripts and you like to live dangerously, please read on. + +Galaxy as an IDE? +Amazingly enough, blend-lib API scripts run perfectly well *inside* Galaxy when pasted into a Tool Factory form. No need to generate a new tool. Galaxy+Tool_Factory = IDE I think we need a new t-shirt. Seriously, it is actually quite useable. + +Why bother - what's wrong with Eclipse +Nothing. But, compared with developing API scripts in the usual way outside Galaxy, you get persistence and other framework benefits plus at absolutely no extra charge, a ginormous security problem if you share the history or any outputs because they contain the api script with key so development servers only please! + +Workflow +Fire up the Tool Factory in Galaxy. + +Leave the input box empty, set the interpreter to python, paste and run an api script - eg working example (substitute the url and key) below. + +It took me a few iterations to develop the example below because I know almost nothing about the API. I started with very simple code from one of the samples and after each run, the (edited..) api script is conveniently recreated using the redo button on the history output item. So each successive version of the developing api script you run is persisted - ready to be edited and rerun easily. It is ''very'' handy to be able to add a line of code to the script and run it, then view the output to (eg) inspect dicts returned by API calls to help move progressively deeper iteratively. + +Give the below a whirl on a private clone (install the tool factory from the main toolshed) and try adding complexity with few rerun/edit/rerun cycles. + +Eg tool factory api script +import sys +from blend.galaxy import GalaxyInstance +ourGal = 'http://x.x.x.x:xxxx' +ourKey = 'xxx' +gi = GalaxyInstance(ourGal, key=ourKey) +libs = gi.libraries.get_libraries() +res = [] +# libs looks like +# u'url': u'/galaxy/api/libraries/441d8112651dc2f3', u'id': u'441d8112651dc2f3', u'name':.... u'Demonstration sample RNA data', +for lib in libs: + res.append('%s:\n' % lib['name']) + res.append(str(gi.libraries.show_library(lib['id'],contents=True))) +outf=open(sys.argv[2],'w') +outf.write('\n'.join(res)) +outf.close() + +**Attribution** +Creating re-usable tools from scripts: The Galaxy Tool Factory +Ross Lazarus; Antony Kaspi; Mark Ziemann; The Galaxy Team +Bioinformatics 2012; doi: 10.1093/bioinformatics/bts573 + +http://bioinformatics.oxfordjournals.org/cgi/reprint/bts573?ijkey=lczQh1sWrMwdYWJ&keytype=ref + +**Licensing** +Copyright Ross Lazarus 2010 +ross lazarus at g mail period com + +All rights reserved. + +Licensed under the LGPL + +**Obligatory screenshot** + +http://bitbucket.org/fubar/galaxytoolmaker/src/fda8032fe989/images/dynamicScriptTool.png diff -r 000000000000 -r 0fa46413d0d9 adduser.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/adduser.sh Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +USER=galaxy +for uid in {1001..1500} +do + adduser $USER$uid -u $uid --gid 1000 --no-create-home --quiet +done diff -r 000000000000 -r 0fa46413d0d9 images/dynamicScriptTool.png Binary file images/dynamicScriptTool.png has changed diff -r 000000000000 -r 0fa46413d0d9 images/piRNAs close to TEs.png Binary file images/piRNAs close to TEs.png has changed diff -r 000000000000 -r 0fa46413d0d9 macros.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/macros.xml Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,180 @@ + + + $OUTF + +A trivial perl script example to show that even perl works:: + + # + # change all occurances of a string in a file to another string + # + $oldfile = $ARGV[0]; + $newfile = $ARGV[1]; + $old = "gene"; + $new = "foo"; + open(OF, $oldfile); + open(NF, ">$newfile"); + # read in each line of the file + while ($line = ) { + $line =~ s/$old/$new/; + print NF $line; + } + close(OF); + close(NF); + +**Citation** + + +Paper_ : + +Creating re-usable tools from scripts: The Galaxy Tool Factory +Ross Lazarus; Antony Kaspi; Mark Ziemann; The Galaxy Team +Bioinformatics 2012; doi: 10.1093/bioinformatics/bts573 + + +**Licensing** + +Copyright Ross Lazarus (ross period lazarus at gmail period com) May 2012 +All rights reserved. +Licensed under the LGPL_ + +.. _LGPL: http://www.gnu.org/copyleft/lesser.html +.. _Docker_toolfactory: https://bitbucket.org/mvdbeek/dockertoolfactory +.. _Issues: https://bitbucket.org/mvdbeek/dockertoolfactory/issues +.. _Paper: http://bioinformatics.oxfordjournals.org/cgi/reprint/bts573?ijkey=lczQh1sWrMwdYWJ&keytype=ref +]]> + + + diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/My_dynamic_script.Rscript --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/html_output/My_dynamic_script.Rscript Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,13 @@ +for (i in 1:10) { + foo = runif(100) + bar = rnorm(100) + bar = foo + 0.05*bar + pdf(paste('yet',i,"anotherplot.pdf",sep='_')) + plot(foo,bar,main=paste("Foo by Bar plot #",i),col="maroon", pch=3,cex=0.6) + dev.off() + foo = data.frame(a=runif(100),b=runif(100),c=runif(100),d=runif(100),e=runif(100),f=runif(100)) + bar = as.matrix(foo) + pdf(paste('yet',i,"anotherheatmap.pdf",sep='_')) + heatmap(bar,main='Random Heatmap') + dev.off() +} \ No newline at end of file diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/My_dynamic_script_error.log diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/My_dynamic_script_html.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/html_output/My_dynamic_script_html.html Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,115 @@ + + + + + + + + +
+ +
Galaxy Tool "My dynamic script" run at 28/09/2015 11:54:04

+
My log output
+My_dynamic_script_error.log is empty
+
Other images and outputs
+(Click on a thumbnail image to download the corresponding original PDF image)
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Image called yet_10_anotherheatmap.pdfImage called yet_10_anotherplot.pdfImage called yet_1_anotherheatmap.pdfImage called yet_1_anotherplot.pdfImage called yet_2_anotherheatmap.pdf
Image called yet_2_anotherplot.pdfImage called yet_3_anotherheatmap.pdfImage called yet_3_anotherplot.pdfImage called yet_4_anotherheatmap.pdfImage called yet_4_anotherplot.pdf
Image called yet_5_anotherheatmap.pdfImage called yet_5_anotherplot.pdfImage called yet_6_anotherheatmap.pdfImage called yet_6_anotherplot.pdfImage called yet_7_anotherheatmap.pdf
Image called yet_7_anotherplot.pdfImage called yet_8_anotherheatmap.pdfImage called yet_8_anotherplot.pdfImage called yet_9_anotherheatmap.pdfImage called yet_9_anotherplot.pdf
+ +
Other log output
+/home/galaxy/galaxy-dist/database/job_working_directory/026/26240/dataset_37404_files/My_dynamic_script_runner.log is empty
+
All output files available for downloading
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Output File Name (click to view)Size
My_dynamic_script.Rscript450 B
My_dynamic_script_error.log0 B
My_dynamic_script_runner.log112 B
yet_10_anotherheatmap.pdf10.8 KB
yet_10_anotherplot.pdf7.0 KB
yet_1_anotherheatmap.pdf10.8 KB
yet_1_anotherplot.pdf6.9 KB
yet_2_anotherheatmap.pdf10.8 KB
yet_2_anotherplot.pdf7.0 KB
yet_3_anotherheatmap.pdf10.8 KB
yet_3_anotherplot.pdf7.0 KB
yet_4_anotherheatmap.pdf10.8 KB
yet_4_anotherplot.pdf6.9 KB
yet_5_anotherheatmap.pdf10.8 KB
yet_5_anotherplot.pdf6.9 KB
yet_6_anotherheatmap.pdf10.8 KB
yet_6_anotherplot.pdf6.9 KB
yet_7_anotherheatmap.pdf10.9 KB
yet_7_anotherplot.pdf6.9 KB
yet_8_anotherheatmap.pdf10.8 KB
yet_8_anotherplot.pdf6.9 KB
yet_9_anotherheatmap.pdf10.8 KB
yet_9_anotherplot.pdf7.0 KB

+
+ diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/My_dynamic_script_runner.log --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/html_output/My_dynamic_script_runner.log Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,1 @@ +## Toolfactory generated command line = Rscript - /home/galaxy/galaxy-dist/database/files/037/dataset_37403.dat diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_10_anotherheatmap.pdf Binary file test-data/html_output/yet_10_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_10_anotherheatmap.png Binary file test-data/html_output/yet_10_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_10_anotherplot.pdf Binary file test-data/html_output/yet_10_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_10_anotherplot.png Binary file test-data/html_output/yet_10_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_1_anotherheatmap.pdf Binary file test-data/html_output/yet_1_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_1_anotherheatmap.png Binary file test-data/html_output/yet_1_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_1_anotherplot.pdf Binary file test-data/html_output/yet_1_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_1_anotherplot.png Binary file test-data/html_output/yet_1_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_2_anotherheatmap.pdf Binary file test-data/html_output/yet_2_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_2_anotherheatmap.png Binary file test-data/html_output/yet_2_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_2_anotherplot.pdf Binary file test-data/html_output/yet_2_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_2_anotherplot.png Binary file test-data/html_output/yet_2_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_3_anotherheatmap.pdf Binary file test-data/html_output/yet_3_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_3_anotherheatmap.png Binary file test-data/html_output/yet_3_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_3_anotherplot.pdf Binary file test-data/html_output/yet_3_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_3_anotherplot.png Binary file test-data/html_output/yet_3_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_4_anotherheatmap.pdf Binary file test-data/html_output/yet_4_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_4_anotherheatmap.png Binary file test-data/html_output/yet_4_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_4_anotherplot.pdf Binary file test-data/html_output/yet_4_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_4_anotherplot.png Binary file test-data/html_output/yet_4_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_5_anotherheatmap.pdf Binary file test-data/html_output/yet_5_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_5_anotherheatmap.png Binary file test-data/html_output/yet_5_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_5_anotherplot.pdf Binary file test-data/html_output/yet_5_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_5_anotherplot.png Binary file test-data/html_output/yet_5_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_6_anotherheatmap.pdf Binary file test-data/html_output/yet_6_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_6_anotherheatmap.png Binary file test-data/html_output/yet_6_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_6_anotherplot.pdf Binary file test-data/html_output/yet_6_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_6_anotherplot.png Binary file test-data/html_output/yet_6_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_7_anotherheatmap.pdf Binary file test-data/html_output/yet_7_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_7_anotherheatmap.png Binary file test-data/html_output/yet_7_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_7_anotherplot.pdf Binary file test-data/html_output/yet_7_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_7_anotherplot.png Binary file test-data/html_output/yet_7_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_8_anotherheatmap.pdf Binary file test-data/html_output/yet_8_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_8_anotherheatmap.png Binary file test-data/html_output/yet_8_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_8_anotherplot.pdf Binary file test-data/html_output/yet_8_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_8_anotherplot.png Binary file test-data/html_output/yet_8_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_9_anotherheatmap.pdf Binary file test-data/html_output/yet_9_anotherheatmap.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_9_anotherheatmap.png Binary file test-data/html_output/yet_9_anotherheatmap.png has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_9_anotherplot.pdf Binary file test-data/html_output/yet_9_anotherplot.pdf has changed diff -r 000000000000 -r 0fa46413d0d9 test-data/html_output/yet_9_anotherplot.png Binary file test-data/html_output/yet_9_anotherplot.png has changed diff -r 000000000000 -r 0fa46413d0d9 tool_dependencies.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tool_dependencies.xml Sat Oct 03 08:34:39 2015 -0400 @@ -0,0 +1,21 @@ + + + + + + + + + + + + docker-py==0.4.0 + + + + + + This is a fork of toolfactory that makes use of Docker to sandbox the generated script. + As such you need to have the system user under which galaxy tools are executed be able to run Docker. + +