changeset 1:60c360e466a8 draft default tip

planemo upload for repository https://github.com/workflow4metabolomics/multivariate.git commit 0f382a5296aae9bfc77df06b0a5ad493eb3c01f3
author ethevenot
date Wed, 28 Feb 2018 10:04:14 -0500
parents 4b9488602d57
children
files Makefile build.xml multivariate_config.xml runit/output/figure.pdf runit/output/information.txt
diffstat 5 files changed, 27 insertions(+), 90 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile	Wed Feb 28 10:04:14 2018 -0500
@@ -0,0 +1,23 @@
+all:
+
+test:
+	test/test-multi
+
+planemo-venv/bin/planemo: planemo-venv
+	. planemo-venv/bin/activate && pip install --upgrade pip setuptools
+	. planemo-venv/bin/activate && pip install planemo
+
+planemo-venv:
+	virtualenv planemo-venv
+
+planemolint: planemo-venv/bin/planemo
+	. planemo-venv/bin/activate && planemo lint
+
+planemotest: planemo-venv/bin/planemo
+	. planemo-venv/bin/activate && planemo test --conda_dependency_resolution --galaxy_branch release_17.05
+
+clean:
+	$(RM) -r $(HOME)/.planemo
+	$(RM) -r planemo-venv
+
+.PHONY:	all clean test planemolint planemotest
--- a/build.xml	Tue Oct 24 08:54:24 2017 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<project name="multivariate" default="all">
-
-	<property name="tool.xml" value="multivariate_config.xml"/>
-	<property name="conda.dir" value="${user.home}/w4m-conda"/>
-
-	<!--~~~
-	~ ALL ~
-	~~~~~-->
-
-	<target name="all"/>
-
-	<!--~~~~
-	~ TEST ~
-	~~~~~-->
-
-	<target name="test" depends="plain.test,planemo.lint,planemo.test"/>
-
-	<!--~~~~~~~~~~
-	~ PLAIN TEST ~
-	~~~~~~~~~~~-->
-
-	<target name="plain.test">
-		<exec executable="test/test-multi" failonerror="true"/>
-	</target>
-
-	<!--~~~~~~~~~~~~
-	~ PLANEMO LINT ~
-	~~~~~~~~~~~~~-->
-
-	<target name="planemo.lint">
-		<exec executable="planemo" failonerror="true">
-			<arg value="lint"/>
-			<arg value="${tool.xml}"/>
-		</exec>
-	</target>
-
-	<!--~~~~~~~~~~~~
-	~ PLANEMO TEST ~
-	~~~~~~~~~~~~~-->
-
-	<target name="planemo.test" depends="planemo.conda.install">
-		<exec executable="planemo" failonerror="true">
-			<arg value="test"/>
-			<arg value="--conda_prefix"/>
-			<arg value="${conda.dir}"/>
-			<arg value="--galaxy_branch"/>
-			<arg value="release_16.07"/>
-			<arg value="--conda_dependency_resolution"/>
-			<arg value="${tool.xml}"/>
-		</exec>
-	</target>
-
-	<!--~~~~~~~~~~~~~~~~~~~~~
-	~ PLANEMO CONDA INSTALL ~
-	~~~~~~~~~~~~~~~~~~~~~~-->
-
-	<target name="planemo.conda.install" depends="planemo.conda.init">
-		<exec executable="planemo" failonerror="true">
-			<arg value="conda_install"/>
-			<arg value="--conda_prefix"/>
-			<arg value="${conda.dir}"/>
-			<arg value="${tool.xml}"/>
-		</exec>
-	</target>
-
-	<!--~~~~~~~~~~~~~~~~~~
-	~ PLANEMO CONDA INIT ~
-	~~~~~~~~~~~~~~~~~~~-->
-
-	<target name="planemo.conda.init">
-		<exec executable="planemo" failonerror="true">
-			<arg value="conda_init"/>
-			<arg value="--conda_prefix"/>
-			<arg value="${conda.dir}"/>
-		</exec>
-	</target>
-
-	<!--~~~~~
-	~ CLEAN ~
-	~~~~~~-->
-
-	<target name="clean">
-		<delete dir="${conda.dir}"/>
-	</target>
-
-</project>
--- a/multivariate_config.xml	Tue Oct 24 08:54:24 2017 -0400
+++ b/multivariate_config.xml	Wed Feb 28 10:04:14 2018 -0500
@@ -2,8 +2,8 @@
   <description>PCA, PLS and OPLS</description>
   
   <requirements>
-    <requirement type="package">r-batch</requirement>
-    <requirement type="package">bioconductor-ropls</requirement>
+    <requirement type="package" version="1.1_4">r-batch</requirement>
+    <requirement type="package" version="1.10.0">bioconductor-ropls</requirement>
   </requirements>
   
   <stdio>
Binary file runit/output/figure.pdf has changed
--- a/runit/output/information.txt	Tue Oct 24 08:54:24 2017 -0400
+++ b/runit/output/information.txt	Wed Feb 28 10:04:14 2018 -0500
@@ -1,5 +1,5 @@
 
-Start of the 'Multivariate' Galaxy module call: Tue 24 Oct 2017 02:50:53 PM
+Start of the 'Multivariate' Galaxy module call: Mon 08 Jan 2018 05:24:55 PM
 
 PLS-DA
 
@@ -11,7 +11,7 @@
 p1 0.0505   0.0505 0.664    0.664  0.4220   0.422      R1     1
 p2 0.0678   0.1180 0.105    0.769 -0.0431   0.397      NS     1
 
-End of 'Multivariate' Galaxy module call: 2017-10-24 14:50:54
+End of 'Multivariate' Galaxy module call: 2018-01-08 17:24:56