Mercurial > repos > ebi-gxa > scanpy_read_10x

--- a/scanpy-read-10x.xml	Wed Apr 03 11:11:38 2019 -0400
+++ b/scanpy-read-10x.xml	Mon Sep 16 08:19:16 2019 -0400
@@ -2,24 +2,33 @@
 <tool id="scanpy_read_10x" name="Scanpy Read10x" version="@TOOL_VERSION@+galaxy0">
   <description>into hdf5 object handled by scanpy</description>
   <macros>
-    <import>scanpy_macros.xml</import>
+    <import>scanpy_macros2.xml</import>
   </macros>
   <expand macro="requirements"/>
   <command detect_errors="exit_code"><![CDATA[
 ln -s '${matrix}' matrix.mtx &&
 ln -s '${genes}' genes.tsv &&
 ln -s '${barcodes}' barcodes.tsv &&
-PYTHONIOENCODING=utf-8 scanpy-read-10x.py
-    -d ./
-    -o read_10x.h5
-    -F '${output_format}'
-    -v '${var_names}'
+PYTHONIOENCODING=utf-8 scanpy-read-10x
+    --input-10x-mtx ./
+    --var-names '${var_names}'
+#if $cell_meta:
+    --extra-obs '${cell_meta}'
+#end if
+#if $gene_meta:
+    --extra-var '${gene_meta}'
+#end if
+    @OUTPUT_OPTS@
 ]]></command>

   <inputs>
     <param name="matrix" type="data" format="txt" label="Expression matrix in sparse matrix format (.mtx)"/>
     <param name="genes" type="data" format="tsv,tabular" label="Gene table"/>
     <param name="barcodes" type="data" format="tsv,tabular" label="Barcode/cell table"/>
+    <param name="cell_meta" type="data" format="tsv,tabular" label="Cell metadata table" optional="true"
+           help="Requires a header row and index column that matches the barcode/cell table"/>
+    <param name="gene_meta" type="data" format="tsv,tabular" label="Gene metadata table" optional="true"
+           help="Requires a header row and index column that matches the gene table"/>
     <expand macro="output_object_params"/>
     <param name="var_names" type="select" label="Attribute used as annotation index">
       <option value="gene_ids" selected="true">Gene ID</option>
@@ -28,7 +37,7 @@
   </inputs>

   <outputs>
-    <data name="output_h5" format="h5" from_work_dir="read_10x.h5" label="${tool.name} on ${on_string}: ${output_format}"/>
+    <data name="output_h5" format="h5" from_work_dir="output.h5" label="${tool.name} on ${on_string}: ${output_format}"/>
   </outputs>

   <tests>
@@ -36,15 +45,16 @@
       <param name="matrix" value="matrix.mtx"/>
       <param name="genes" value="genes.tsv"/>
       <param name="barcodes" value="barcodes.tsv"/>
+      <!-- <param name="cell_meta" value=""/> -->
       <param name="output_format" value="anndata"/>
-      <output name="output_h5" file="read_10x.h5" ftype="h5" compare="sim_size"/>
+      <output name="output_h5" file="output.h5" ftype="h5" compare="sim_size"/>
     </test>
   </tests>

   <help><![CDATA[
-==========================================================
-Read 10x-Genomics-formatted mtx directory (`read_10x_mtx`)
-==========================================================
+=================================================================
+Read 10x-Genomics-formatted mtx directory (`scanpy.read_10x_mtx`)
+=================================================================

 The mtx directory should contain:

@@ -54,8 +64,9 @@

 3) A barcode/cell table of at least one column giving the barcode/cell IDs.

-The above-mentioned files can be obtained by running `EBI SCXA Data Retrieval`
-with a dataset accession.
+The above-mentioned files can be obtained by running `EBI SCXA Data Retrieval` with a dataset accession or `Human Cell Atlas Matrix Downloader` with a project name/label/UUID.
+
+Additionally, cell and/or gene metadata table can be provided as tab-separated text with a header row and an index column that matches the respective barcode/cell and/or gene table.


 @HELP@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scanpy_macros2.xml	Mon Sep 16 08:19:16 2019 -0400
@@ -0,0 +1,94 @@
+<macros>
+  <token name="@TOOL_VERSION@">1.4.2</token>
+  <token name="@HELP@">More information can be found at https://scanpy.readthedocs.io</token>
+  <token name="@VERSION_HISTORY@"><![CDATA[
+**Version history**
+
+1.4.2+galaxy0: Update to scanpy-scripts 0.2.4 (requires scanpy >=1.4.2).
+
+1.3.2+galaxy1: Normalise-data and filter-genes: Exposes ability to output 10x files.
+
+1.3.2+galaxy0: Initial contribution. Ni Huang and Pablo Moreno, Expression Atlas team https://www.ebi.ac.uk/gxa/home  at
+EMBL-EBI https://www.ebi.ac.uk/ and Teichmann Lab at Wellcome Sanger Institute.
+    ]]></token>
+  <token name="@INPUT_OPTS@">
+    --input-format '${input_format}' input.h5
+  </token>
+  <token name="@OUTPUT_OPTS@">
+    --show-obj stdout --output-format '${output_format}' output.h5
+  </token>
+  <token name="@PLOT_OPTS@">
+#if $fig_title
+    --title '${fig_title}'
+#end if
+    --fig-size '${fig_size}'
+    --fig-dpi ${fig_dpi}
+    --fig-fontsize ${fig_fontsize}
+    ${fig_frame}
+    ./output.png
+  </token>
+  <token name="@EXPORT_MTX_OPTS@">${export_mtx}</token>
+
+  <xml name="requirements">
+    <requirements>
+      <requirement type="package" version="0.2.4.post4">scanpy-scripts</requirement>
+      <yield/>
+    </requirements>
+  </xml>
+
+  <xml name="citations">
+    <citations>
+      <yield />
+      <citation type="doi">10.1186/s13059-017-1382-0</citation>
+      <citation type="bibtex">
+	@misc{githubscanpy-scripts,
+	author = {Ni Huang, EBI Gene Expression Team},
+	year = {2018},
+	title = {Scanpy-scripts: command line interface for Scanpy},
+	publisher = {GitHub},
+	journal = {GitHub repository},
+	url = {https://github.com/ebi-gene-expression-group/scanpy-scripts},
+      }</citation>
+    </citations>
+  </xml>
+
+  <xml name="input_object_params">
+    <param name="input_obj_file" argument="input-object-file" type="data" format="h5" label="Input object in hdf5 format"/>
+    <param name="input_format" argument="--input-format" type="select" label="Format of input object">
+      <option value="anndata" selected="true">AnnData format hdf5</option>
+      <option value="loom">Loom format hdf5</option>
+    </param>
+  </xml>
+
+  <xml name="output_object_params">
+    <param name="output_format" argument="--output-format" type="select" label="Format of output object">
+      <option value="anndata" selected="true">AnnData format hdf5</option>
+      <option value="loom">Loom format hdf5</option>
+    </param>
+  </xml>
+
+  <xml name="output_plot_params">
+    <param name="fig_title" argument="--title" type="text" label="Figure title"/>
+    <param name="fig_size" argument="--fig-size" type="text" value="4,4" label="Figure size as 'width,height', e.g, '7,7'"/>
+    <param name="fig_dpi" argument="--fig-dpi" type="integer" min="1" value="80" label="Figure dpi"/>
+    <param name="fig_fontsize" argument="--fig-fontsize" type="integer" min="0" value="10" label="Figure font size"/>
+    <param name="fig_frame" type="boolean" truevalue="--frameon" falsevalue="--frameoff" checked="false"
+           label="Show plot frame"/>
+  </xml>
+
+  <xml name="export_mtx_params">
+    <param name="export_mtx" argument="--export-mtx" type="boolean" truevalue="--export-mtx ./" falsevalue="" checked="false" label="Save normalised data to 10x mtx format" help="If enabled, it will generate in addition to the main output in Loom or AnnData an export in 10x format of the normalised data."/>
+  </xml>
+
+  <xml name="export_mtx_outputs">
+    <data name="matrix_10x" format="txt" from_work_dir="matrix.mtx" label="${tool.name} on ${on_string}: 10x matrix">
+      <filter>export_mtx</filter>
+    </data>
+    <data name="genes_10x" format="tsv" from_work_dir="genes.tsv" label="${tool.name} on ${on_string}: 10x genes">
+      <filter>export_mtx</filter>
+    </data>
+    <data name="barcodes_10x" format="tsv" from_work_dir="barcodes.tsv" label="${tool.name} on ${on_string}: 10x barcodes">
+      <filter>export_mtx</filter>
+    </data>
+  </xml>
+</macros>