# HG changeset patch
# User iuc
# Date 1576160699 18000
# Node ID a8f865950ac4ac8f4fa1d2648e502f14ac819412
# Parent 4bfb75bb7c8ef3221d0b4b3ac281ecf2e1158f3d
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/scanpy/ commit 3b41d687ff30583540d055f6995de00530cca81d"
diff -r 4bfb75bb7c8e -r a8f865950ac4 macros.xml
--- a/macros.xml Thu Dec 05 07:10:37 2019 -0500
+++ b/macros.xml Thu Dec 12 09:24:59 2019 -0500
@@ -1,7 +1,7 @@
1.4.4.post1
19.01
-
+
scanpy
@@ -351,10 +351,10 @@
-
+
-
+
@@ -378,12 +378,12 @@
-
-
+
+
-
+
@@ -404,27 +404,20 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 0:
#set $var_group_positions=[]
@@ -673,7 +677,7 @@
-
+
@@ -742,7 +746,7 @@
saturation=$method.seaborn_violinplot.saturation,
]]>
-
+
-
-
+
+
-
-
-
+
+
+
+
@@ -814,12 +824,14 @@
-
+
+
-
+
+
@@ -835,9 +847,21 @@
+
+
+
+
@@ -879,7 +903,7 @@
]]>
-
+
@@ -894,6 +918,7 @@
+
@@ -905,21 +930,20 @@
@@ -937,22 +961,22 @@
-
+
-
+
-
+
-
+
-
+
@@ -1022,12 +1046,158 @@
]]>
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 4bfb75bb7c8e -r a8f865950ac4 plot.xml
--- a/plot.xml Thu Dec 05 07:10:37 2019 -0500
+++ b/plot.xml Thu Dec 12 09:24:59 2019 -0500
@@ -37,53 +37,33 @@
#end if
use_raw=$method.use_raw,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
projection='$method.plot.projection',
legend_loc='$method.plot.legend_loc',
- legend_fontsize=$method.plot.legend_fontsize,
+ @CMD_param_legend_fontsize@
legend_fontweight='$method.plot.legend_fontweight',
color_map='$method.plot.color_map',
+ #if str($method.plot.palette) != ''
palette='$method.plot.palette',
+ #end if
frameon=$method.plot.frameon,
- #if $method.plot.title
- title='$method.plot.title',
- #end if
- size=$method.plot.size)
+ @CMD_param_title@
+ @CMD_param_size@)
#else if $method.method == 'pl.heatmap'
sc.pl.heatmap(
@CMD_param_plot_inputs@
+ @CMD_params_inputs@
@CMD_params_plots@
- swap_axes=$method.swap_axes,
- show_gene_labels=$method.show_gene_labels,
- cmap='$method.matplotlib_pyplot_imshow.cmap',
- #if str($method.matplotlib_pyplot_imshow.interpolation) != 'None'
- interpolation='$method.matplotlib_pyplot_imshow.interpolation',
- #end if
- #if $method.matplotlib_pyplot_imshow.alpha
- alpha=$method.matplotlib_pyplot_imshow.alpha,
- #end if
- #if $method.matplotlib_pyplot_imshow.vmin
- vmin=$method.matplotlib_pyplot_imshow.vmin,
- #end if
- #if $method.matplotlib_pyplot_imshow.vmax
- vmax=$method.matplotlib_pyplot_imshow.vmax,
- #end if
- origin='$method.matplotlib_pyplot_imshow.origin')
+ @CMD_pl_heatmap@)
#else if $method.method == 'pl.dotplot'
sc.pl.dotplot(
@CMD_param_plot_inputs@
+ @CMD_params_inputs@
@CMD_params_plots@
- color_map='$method.color_map',
- #if $method.dot_max
- dot_max=$method.dot_max,
- #end if
- #if $method.dot_min
- dot_min=$method.dot_min,
- #end if
- @CMD_params_matplotlib_pyplot_scatter@)
+ @CMD_pl_dotplot@)
#else if $method.method == 'pl.violin'
sc.pl.violin(
@@ -118,33 +98,16 @@
#else if $method.method == 'pl.stacked_violin'
sc.pl.stacked_violin(
@CMD_param_plot_inputs@
+ @CMD_params_inputs@
@CMD_params_plots@
- swap_axes=$method.swap_axes,
- @CMD_conditional_stripplot@
- scale='$method.violin_plot.scale',
- row_palette='$method.row_palette',
- #if str($method.standard_scale) != 'None'
- standard_scale='$method.standard_scale',
- #end if
- @CMD_params_seaborn_violinplot@)
+ @CMD_pl_stacked_violin@)
#else if $method.method == 'pl.matrixplot'
sc.pl.matrixplot(
@CMD_param_plot_inputs@
+ @CMD_params_inputs@
@CMD_params_plots@
- swap_axes=$method.swap_axes,
- cmap='$method.matplotlib_pyplot_pcolor.cmap',
- #if $method.matplotlib_pyplot_pcolor.vmin
- vmin=$method.matplotlib_pyplot_pcolor.vmin,
- #end if
- #if $method.matplotlib_pyplot_pcolor.vmax
- vmax=$method.matplotlib_pyplot_pcolor.vmax,
- #end if
- edgecolors='$method.matplotlib_pyplot_pcolor.edgecolors',
- #if $method.matplotlib_pyplot_pcolor.alpha
- alpha=$method.matplotlib_pyplot_pcolor.alpha,
- #end if
- snap=$method.matplotlib_pyplot_pcolor.snap)
+ @CMD_pl_matrixplot@)
#else if $method.method == 'pl.clustermap'
sc.pl.clustermap(
@@ -190,8 +153,7 @@
log=$method.log,
save='.$format',
show=False,
- highly_variable_genes=$method.highly_variable_genes
- )
+ highly_variable_genes=$method.highly_variable_genes)
#else if $method.method == 'pl.pca'
sc.pl.pca(
@@ -199,7 +161,7 @@
@CMD_param_color@
use_raw=$method.use_raw,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
@CMD_pl_attribute_section@
@CMD_params_matplotlib_pyplot_scatter@)
@@ -222,7 +184,7 @@
@CMD_param_color@
use_raw=$method.use_raw,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
@CMD_pl_attribute_section@
@CMD_params_matplotlib_pyplot_scatter@)
@@ -235,7 +197,7 @@
@CMD_pl_edges@
arrows=$method.arrows,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
@CMD_pl_attribute_section@
@CMD_params_matplotlib_pyplot_scatter@)
@@ -248,7 +210,7 @@
@CMD_pl_edges@
arrows=$method.arrows,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
@CMD_pl_attribute_section@
@CMD_params_matplotlib_pyplot_scatter@)
@@ -259,7 +221,7 @@
@CMD_param_color@
use_raw=$method.use_raw,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
@CMD_pl_attribute_section@
@CMD_params_matplotlib_pyplot_scatter@)
@@ -282,7 +244,7 @@
#end if
arrows=$method.arrows,
sort_order=$method.sort_order,
- @CMD_params_pl_groups@
+ @CMD_params_groups@
@CMD_params_pl_components@
@CMD_pl_attribute_section@
@CMD_params_matplotlib_pyplot_scatter@)
@@ -290,13 +252,18 @@
#else if $method.method == 'pl.dpt_groups_pseudotime'
sc.pl.dpt_groups_pseudotime(
@CMD_param_plot_inputs@
- color_map='$method.color_map')
+ #if str($method.color_map) != ''
+ color_map='$method.color_map'
+ #end if
+ )
#else if $method.method == 'pl.dpt_timeseries'
sc.pl.dpt_timeseries(
@CMD_param_plot_inputs@
#if $method.heatmap.as_heatmap == "True"
+ #if str($method.heatmap.color_map) != ''
color_map='$method.heatmap.color_map',
+ #end if
#end if
as_heatmap=$method.heatmap.as_heatmap)
@@ -322,7 +289,9 @@
#set $annotations=([x.strip() for x in str($method.annotations).split(',')])
annotations=$annotations,
#end if
+ #if str($method.color_map) != ''
color_map='$method.color_map',
+ #end if
n_avg=$method.n_avg,
#if str($method.annotations) != ''
groups_key='$method.groups_key',
@@ -336,7 +305,7 @@
#else if $method.method == 'pl.rank_genes_groups'
sc.pl.rank_genes_groups(
@CMD_param_plot_inputs@
- @CMD_params_pl_groups@
+ @CMD_params_groups@
n_genes=$method.n_genes,
#if str($method.gene_symbols) != ''
gene_symbols='$method.gene_symbols',
@@ -348,14 +317,16 @@
#else if $method.method == 'pl.rank_genes_groups_violin'
sc.pl.rank_genes_groups_violin(
@CMD_param_plot_inputs@
- @CMD_params_pl_groups@
+ @CMD_params_groups@
#if $method.genes.select == 'n_genes'
n_genes=$method.genes.n_genes,
#else
#set $gene_names = ([x.strip() for x in str($method.genes.gene_names).split(',')])
gene_names=$gene_names,
#end if
+ #if str($method.gene_symbols) != ''
gene_symbols='$method.gene_symbols',
+ #end if
use_raw=$method.use_raw,
split=$method.split,
strip=$method.violin_plot.stripplot.stripplot,
@@ -367,6 +338,34 @@
#end if
scale='$method.violin_plot.scale')
+#else if $method.method == 'pl.rank_genes_groups_dotplot'
+sc.pl.rank_genes_groups_dotplot(
+ @CMD_param_plot_inputs@
+ @CMD_pl_rank_genes_groups_ext@
+ @CMD_params_plots@
+ @CMD_pl_dotplot@)
+
+#else if $method.method == 'pl.rank_genes_groups_heatmap'
+sc.pl.rank_genes_groups_heatmap(
+ @CMD_param_plot_inputs@
+ @CMD_pl_rank_genes_groups_ext@
+ @CMD_params_plots@
+ @CMD_pl_heatmap@)
+
+#else if $method.method == 'pl.rank_genes_groups_matrixplot'
+sc.pl.rank_genes_groups_matrixplot(
+ @CMD_param_plot_inputs@
+ @CMD_pl_rank_genes_groups_ext@
+ @CMD_params_plots@
+ @CMD_pl_matrixplot@)
+
+#else if $method.method == 'pl.rank_genes_groups_stacked_violin'
+sc.pl.rank_genes_groups_stacked_violin(
+ @CMD_param_plot_inputs@
+ @CMD_pl_rank_genes_groups_ext@
+ @CMD_params_plots@
+ @CMD_pl_stacked_violin@)
+
#end if
]]>
@@ -375,43 +374,36 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -420,35 +412,35 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
-
-
-
+
+
+
-
+
@@ -524,7 +483,7 @@
-
+
@@ -536,41 +495,19 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
@@ -608,7 +545,7 @@
-
+
@@ -621,12 +558,12 @@
-
+
-
+
@@ -636,7 +573,7 @@
-
+
@@ -646,7 +583,7 @@
-
+
@@ -656,7 +593,7 @@
-
+
@@ -664,7 +601,7 @@
-
+
@@ -678,7 +615,7 @@
-
+
@@ -706,7 +643,7 @@
-
+
@@ -719,22 +656,22 @@
-
-
+
+
-
+
-
+
@@ -748,6 +685,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -755,21 +712,21 @@
format == 'png' and method['method'] != 'pl.rank_genes_groups_violin'
-
+
format == 'png' and method['method'] == 'pl.rank_genes_groups_violin'
format == 'pdf' and method['method'] != pl.rank_genes_groups_violin
-
+
format == 'pdf' and method['method'] == 'pl.rank_genes_groups_violin'
format == 'svg' and method['method'] != pl.rank_genes_groups_violin
-
+
format == 'svg' and method['method'] == 'pl.rank_genes_groups_violin'
@@ -852,7 +809,6 @@
-
@@ -870,9 +826,9 @@
+
-
@@ -914,9 +870,9 @@
+
-
@@ -1020,9 +976,9 @@
+
-
@@ -1611,13 +1567,151 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`__
-Marker genes: Plot ranking of genes for all tested comparisons (`pl.rank_genes_groups_violin`)
-==============================================================================================
+Marker genes: Plot ranking of genes as violin plot (`pl.rank_genes_groups_violin`)
+==================================================================================
More details on the `scanpy documentation
`__
+
+Marker genes: Plot ranking of genes as dotplot plot (`pl.rank_genes_groups_dotplot`)
+====================================================================================
+
+More details on the `scanpy documentation
+`__
+
+Marker genes: Plot ranking of genes as heatmap plot (`pl.rank_genes_groups_heatmap`)
+====================================================================================
+
+More details on the `scanpy documentation
+`__
+
+Marker genes: Plot ranking of genes as matrixplot plot (`pl.rank_genes_groups_matrixplot`)
+==========================================================================================
+
+More details on the `scanpy documentation
+`__
+
+Marker genes: Plot ranking of genes as stacked violin plot (`pl.rank_genes_groups_stacked_violin`)
+==================================================================================================
+
+More details on the `scanpy documentation
+`__
]]>
diff -r 4bfb75bb7c8e -r a8f865950ac4 test-data/pl.rank_genes_groups_dotplot.rank_genes_groups.krumsiek11.png
Binary file test-data/pl.rank_genes_groups_dotplot.rank_genes_groups.krumsiek11.png has changed
diff -r 4bfb75bb7c8e -r a8f865950ac4 test-data/pl.rank_genes_groups_heatmap.rank_genes_groups.krumsiek11.png
Binary file test-data/pl.rank_genes_groups_heatmap.rank_genes_groups.krumsiek11.png has changed
diff -r 4bfb75bb7c8e -r a8f865950ac4 test-data/pl.rank_genes_groups_matrixplot.rank_genes_groups.krumsiek11.png
Binary file test-data/pl.rank_genes_groups_matrixplot.rank_genes_groups.krumsiek11.png has changed
diff -r 4bfb75bb7c8e -r a8f865950ac4 test-data/pl.rank_genes_groups_stacked_violin.rank_genes_groups.krumsiek11.png
Binary file test-data/pl.rank_genes_groups_stacked_violin.rank_genes_groups.krumsiek11.png has changed
diff -r 4bfb75bb7c8e -r a8f865950ac4 test-data/pp.highly_variable_genes.krumsiek11-cell_ranger.h5ad
Binary file test-data/pp.highly_variable_genes.krumsiek11-cell_ranger.h5ad has changed