Previous changeset 16:0027d2f66096 (2015-01-28) Next changeset 18:a11e053d4976 (2015-02-01) |
Commit message:
Uploaded |
modified:
getlocalrpackages.py rgToolFactory2.xml |
b |
diff -r 0027d2f66096 -r a584ff2f7554 getlocalrpackages.py --- a/getlocalrpackages.py Wed Jan 28 19:28:53 2015 -0500 +++ b/getlocalrpackages.py Sun Feb 01 19:46:48 2015 -0500 |
[ |
@@ -1,5 +1,16 @@ import os import subprocess +import sys + +new_path = [ os.path.join( os.getcwd(), "lib" ) ] +#new_path.extend( sys.path[1:] ) # remove scripts/ from the path +sys.path = new_path +from galaxy import config + +aconfig = config.Configuration( ) +M_A_K = aconfig.master_api_key +print M_A_K + def find_packages(prefix="package_r_"): """ @@ -12,7 +23,10 @@ eprefix = prefix if prefix.find('/') <> -1: eprefix = prefix.replace('/','\/') # for grep - cl = ['locate env.sh | grep -i %s' % eprefix,] + path = '.' + # fails on nitesh's recent mac - locate not working + # cl = ['locate env.sh | grep -i %s' % eprefix,] + cl = ['find %s -iname "env.sh" | grep -i %s' % (path,eprefix),] p = subprocess.Popen(cl, stdout=subprocess.PIPE, stderr=subprocess.PIPE,shell=True) out, err = p.communicate() fpaths = out.split('\n') |
b |
diff -r 0027d2f66096 -r a584ff2f7554 rgToolFactory2.xml --- a/rgToolFactory2.xml Wed Jan 28 19:28:53 2015 -0500 +++ b/rgToolFactory2.xml Sun Feb 01 19:46:48 2015 -0500 |
b |
@@ -264,7 +264,7 @@ <param name="runme" value="tf2_test_runme.py"/> <output name='output1' file='tf2_test_out.xls' compare='diff' lines_diff = '10'/> <output name='html_file' file="tf2_test.html" compare='diff' lines_diff = '10'/> - <output name='new_tool' file="tf2_test.toolshed.gz" compare="sim_size" delta="20" /> + <output name='new_tool' file="tf2_test.toolshed.gz" compare="sim_size" delta="600" /> </test> </tests> <help> |