| Previous changeset 56:68fbdbe35f08 (2020-10-20) Next changeset 58:d48b2794d250 (2020-10-22) |
|
Commit message:
Uploaded |
|
modified:
toolfactory/rgToolFactory2.py toolfactory/rgToolFactory2.xml |
| b |
| diff -r 68fbdbe35f08 -r d21517a36db8 toolfactory/rgToolFactory2.py --- a/toolfactory/rgToolFactory2.py Tue Oct 20 03:20:32 2020 +0000 +++ b/toolfactory/rgToolFactory2.py Thu Oct 22 00:56:46 2020 +0000 |
| [ |
| @@ -629,7 +629,6 @@ else: # work around special case - stdin and write to stdout sti = open(self.infiles[0][IPATHPOS], "rb") sto = open(self.outfiles[0][ONAMEPOS], "wb") - # must use shell to redirect p = subprocess.run(self.cl, shell=False, stdout=sto, stdin=sti) retval = p.returncode sto.close() @@ -696,6 +695,7 @@ cll = [ "planemo", "test", + "--skip_venv", "--galaxy_root", self.args.galaxy_root, "--update_test_data", @@ -703,7 +703,7 @@ ] else: cll = ["planemo", "test", "--galaxy_root", - self.args.galaxy_root, + self.args.galaxy_root, "--skip_venv", xreal,] p = subprocess.run( cll, shell=False, cwd=self.tooloutdir, stderr=tout, stdout=tout |
| b |
| diff -r 68fbdbe35f08 -r d21517a36db8 toolfactory/rgToolFactory2.xml --- a/toolfactory/rgToolFactory2.xml Tue Oct 20 03:20:32 2020 +0000 +++ b/toolfactory/rgToolFactory2.xml Thu Oct 22 00:56:46 2020 +0000 |
| [ |
| @@ -1,5 +1,5 @@ <tool id="rgTF2" name="toolfactory" version="2.00" profile="16.04" > - <description>Scripts into tools v2</description> + <description>Scripts into tools v2.01</description> <macros> <xml name="tool_metadata"> <param name="tool_version" label="Tool Version - bump this to warn users trying to redo old analyses" type="text" value="0.01" @@ -133,9 +133,8 @@ <requirements> <requirement type="package" version="0.72.0" >planemo</requirement> - <requirement type="package" >bioblend</requirement> - <requirement type="package" >galaxyxml</requirement> - <requirement type="package" >ephemeris</requirement> + <requirement type="package" version=">=0.4.11"> galaxyxml</requirement> + <requirement type="package" version=">=0.10.6" >ephemeris</requirement> </requirements> <command ><![CDATA[ |