Mercurial > repos > devteam > column_maker

changeset 5:c6fdc1118036 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://github.com/galaxyproject/tools-devteam/tree/master/tools/column_maker commit 0cb87d8f454f205af021d653d7f7d5a7c14c7718"
author devteam
date Wed, 15 Jul 2020 14:38:05 +0000
parents 3335c0d583d8
children 0aeda7a81b46
files column_maker.py column_maker.xml
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/column_maker.py	Thu Jun 04 09:03:25 2020 +0000
+++ b/column_maker.py	Wed Jul 15 14:38:05 2020 +0000
@@ -46,7 +46,7 @@
     expr = expr.replace(key, value)
 
 operators = 'is|not|or|and'
-builtin_and_math_functions = 'abs|all|any|bin|chr|cmp|complex|divmod|float|bool|hex|int|len|long|max|min|oct|ord|pow|range|reversed|round|sorted|str|sum|type|unichr|unicode|log|exp|sqrt|ceil|floor'
+builtin_and_math_functions = 'abs|all|any|bin|chr|cmp|complex|divmod|float|bool|hex|int|len|long|max|min|oct|ord|pow|range|reversed|round|sorted|str|sum|type|unichr|unicode|log|log10|exp|sqrt|ceil|floor'
 string_and_list_methods = [name for name in dir('') + dir([]) if not name.startswith('_')]
 whitelist = r"^([c0-9\+\-\*\/\(\)\.\'\"><=,:! ]|%s|%s|%s)*$" % (operators, builtin_and_math_functions, '|'.join(string_and_list_methods))
 if not re.compile(whitelist).match(expr):
@@ -84,6 +84,7 @@
     exp,
     floor,
     log,
+    log10,
     sqrt
 )
 from numpy import format_float_positional
--- a/column_maker.xml	Thu Jun 04 09:03:25 2020 +0000
+++ b/column_maker.xml	Wed Jul 15 14:38:05 2020 +0000
@@ -1,4 +1,4 @@
-<tool id="Add_a_column1" name="Compute" version="1.3.0">
+<tool id="Add_a_column1" name="Compute" version="1.3.1">
     <description>an expression on every row</description>
     <requirements>
         <requirement type="package" version="2.7.13">python</requirement>
@@ -149,11 +149,11 @@
    chr1  151081985  151082078  3  500  +  False
 
 
-The following build-in functions are available::
+The following built-in functions are available::
 
   abs | all | any | bin | bool | chr | ceil | cmp | complex
 
-  divmod | exp | float | log | floor | hex | int | len | long
+  divmod | exp | float | log | log10 | floor | hex | int | len | long
 
   max | min | oct | ord | pow | range | reversed