diff tool_dependencies.xml @ 1:134585210cb5 draft

planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_python_2_7_scikit_learn_0_15 commit 5a986267144da2093f820e1833325fd3d5902c7d-dirty
author iuc
date Sun, 17 May 2015 16:40:02 -0400
parents 088ad9f80c9d
children 5b23df7cfbda
line wrap: on
line diff
--- a/tool_dependencies.xml	Sun May 17 14:53:39 2015 -0400
+++ b/tool_dependencies.xml	Sun May 17 16:40:02 2015 -0400
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="python" version="2.7">
-        <repository changeset_revision="3f2a853e2ef5" name="package_python_2_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="55bebb0e06ec" name="package_python_2_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="numpy" version="1.9">
-        <repository changeset_revision="a095a5975d3a" name="package_python_2_7_numpy_1_9" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="1b7d6172a358" name="package_python_2_7_numpy_1_9" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="scipy" version="0.14">
-        <repository changeset_revision="8d22fd5a704c" name="package_python_2_7_scipy_0_14" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="b24af010d80a" name="package_python_2_7_scipy_0_14" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="matplotlib" version="1.4">
         <repository changeset_revision="652ee3afbd12" name="package_python_2_7_matplotlib_1_4" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
@@ -15,36 +15,32 @@
     <package name="scikit_learn" version="0.15">
         <install version="1.0">
             <actions>
-                <action type="set_environment_for_install">
-                    <repository changeset_revision="a095a5975d3a" name="package_python_2_7_numpy_1_9" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                <action type="setup_python_environment">
+                   <repository changeset_revision="55bebb0e06ec" name="package_python_2_7" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                       <package name="python" version="2.7" />
+                   </repository>
+                    <repository changeset_revision="1b7d6172a358" name="package_python_2_7_numpy_1_9" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="numpy" version="1.9" />
                     </repository>
-                    <repository changeset_revision="8d22fd5a704c" name="package_python_2_7_scipy_0_14" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="b24af010d80a" name="package_python_2_7_scipy_0_14" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="scipy" version="0.14" />
                     </repository>
                     <repository changeset_revision="652ee3afbd12" name="package_python_2_7_matplotlib_1_4" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="matplotlib" version="1.4" />
                     </repository>
-                </action>
-
-                <action type="setup_python_environment">
-                   <repository changeset_revision="3f2a853e2ef5" name="package_python_2_7" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
-                       <package name="python" version="2.7" />
-                   </repository>
-
                     <!-- allow downloading and installing an Python package from https://pypi.org/ -->
                     <package>https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz#md5=d9822ad0238e17b382a3c756ea94fe0d</package>
                 </action>
 
                 <action type="set_environment">
-                    <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
+                    <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable>
                     <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_SCIPY]</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$ENV[PATH_SCIPY]</environment_variable>
                     <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_MATPLOTLIB]</environment_variable>
-                    <environment_variable action="set_to" name="PYTHONPATH_SCIKIT_LEARN">$INSTALL_DIR/lib/python</environment_variable>
+                    <environment_variable action="set_to" name="PYTHONPATH_SCIKIT_LEARN">$INSTALL_DIR</environment_variable>
                 </action>
             </actions>
         </install>