# HG changeset patch # User jjohnson # Date 1608243791 0 # Node ID 4b65133e0722325a1077cf6bc126ea0b078d0521 # Parent 6f05390deffa0adba4e5c9fd8bbdf87f7874b11a "planemo upload for repository https://github.com/jj-umn/galaxytools/tree/master/pandas_pivot_table/ commit e0560d99fd88685476e4b65235b89edeb20e8426-dirty" diff -r 6f05390deffa -r 4b65133e0722 pandas_pivot_table.py --- a/pandas_pivot_table.py Wed Dec 16 17:44:58 2020 +0000 +++ b/pandas_pivot_table.py Thu Dec 17 22:23:11 2020 +0000 @@ -127,7 +127,7 @@ columns = getColumns(args.columns, df_columns) values = getColumns(args.values, df_columns) fill_value = getValueType(args.fill_value) - aggfunc = getAggFunc(args.aggfunc, values) + aggfunc = getAggFunc(args.aggfunc.replace('\'', '"'), values) pdf = df.pivot_table(index=index, columns=columns, values=values, aggfunc=aggfunc, fill_value=fill_value) diff -r 6f05390deffa -r 4b65133e0722 pandas_pivot_table.xml --- a/pandas_pivot_table.xml Wed Dec 16 17:44:58 2020 +0000 +++ b/pandas_pivot_table.xml Thu Dec 17 22:23:11 2020 +0000 @@ -1,7 +1,12 @@ - + transform tabular data 1.1.4 + '(min|max|sum|size|count|mean|std|var|prod|all|any)' + (@AGGFUNC@|[[]\s*@AGGFUNC@(,\s*@AGGFUNC@)*]) + '\S+'\s*:\s*@AGGFUNCS@ + {@AGGITEM@(,\s*@AGGITEM@)*} + (@AGGFUNCS@|@AGGDICT@) pandas @@ -19,7 +24,7 @@ --index '$pvt_index' --columns '$pvt_columns' --values '$pvt_values' - --aggfunc='$aggfunc' + --aggfunc="$aggfunc" #if $fill_value --fill_value '$fill_value' #end if @@ -60,28 +65,28 @@ ^\S+(,\S+)*$ - -
  • A single function applied to each value column: "min"
  • -
  • An array of functions applied to each value column: ["min", "max", "mean", "std"]
  • -
  • A dictionary of value column : function(s): {"A" : "sum", "B" : ["min", "max"]}
  • - + +
  • Available Number Functions: @AGGFUNC@
  • +
  • Specify functions as (remember the single quotes):
  • +
      +
    • - A single function applied to each value column: 'min'
    • +
    • - An array of functions applied to each value column: ['min', 'max', 'mean', 'std']
    • +
    • - A dictionary of value column : function(s): {'A' : 'sum', 'B' : ['min', 'max']}
    • +
    + ]]>
    - .*".+".* + @AGGF@ - - - - - Default is six decimal places: %0.6f - ^%\d+.\d+[fFeEgGn]$ + %0.6f For scientific: %0.6e]]> + ^%\d+.\d+[fFeEgGn]$ @@ -109,7 +114,7 @@ - + @@ -124,7 +129,7 @@ - + @@ -139,7 +144,7 @@ - +