changeset 51:4b71b252eacb draft

Uploaded
author fubar
date Sun, 30 Aug 2020 06:36:26 -0400
parents bf432f4486c7
children e8bf01166d74
files toolfactory/rgToolFactory2.py toolfactory/tool_dependencies.xml
diffstat 2 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/toolfactory/rgToolFactory2.py	Sun Aug 30 01:45:27 2020 -0400
+++ b/toolfactory/rgToolFactory2.py	Sun Aug 30 06:36:26 2020 -0400
@@ -719,16 +719,12 @@
                 "--update_test_data",
                 "--galaxy_python_version",
                 "3.6",
-                "--no_conda_auto_install",
-                "--no_conda_auto_init",
                 xreal,
             ]
         else:
             cll = ["planemo", "test", "--galaxy_python_version",
                 "3.6", "--galaxy_root",
                 self.args.galaxy_root,
-                "--no_conda_auto_install",
-                "--no_conda_auto_init",
                 xreal,]
         p = subprocess.run(
                 cll, shell=True, cwd=self.tooloutdir, stderr=tout, stdout=tout
@@ -769,7 +765,7 @@
             self.args.toolshed_url,
             "--section_label",
             "Generated Tools",
-            "--install_tool_dependencies",
+
         ]
         print("running\n", " ".join(cll))
         p = subprocess.run(cll, shell=False, stderr=tout, stdout=tout)
--- a/toolfactory/tool_dependencies.xml	Sun Aug 30 01:45:27 2020 -0400
+++ b/toolfactory/tool_dependencies.xml	Sun Aug 30 06:36:26 2020 -0400
@@ -3,12 +3,12 @@
     <package name="planemoenv">
         <install version="0.1">
             <actions>
-                <action python="3.6" type="setup_virtualenv">
-                    planemo==0.72.0.dev0
-                    bioblend==0.14.0
-                    ephemeris==0.10.6
-                    galaxyxml==0.4.10
-                    lxml==4.5.1
+                <action python="3.7" type="setup_virtualenv">
+planemo==0.72.0.dev0
+bioblend==0.14.0
+ephemeris==0.10.6
+galaxyxml==0.4.10
+lxml==4.5.1
                     </action>
             </actions>
         </install>