From 8992e1bd88ea21b273b3b4d093843ba1f4d91ffa Mon Sep 17 00:00:00 2001 From: MikeDMorgan Date: Fri, 7 Nov 2014 14:55:13 +0000 Subject: [PATCH 1/2] cluster_runnable requires kwargs - note added to docs --- CGAT/Pipeline.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CGAT/Pipeline.py b/CGAT/Pipeline.py index cfedac95..62b0e890 100644 --- a/CGAT/Pipeline.py +++ b/CGAT/Pipeline.py @@ -2158,8 +2158,13 @@ def cluster_runnable(func): and *toCluster* true. This will submit the function as an external job, but run it on the local machine. + Note: all arguments in decorated function must be passed as + key-word arguments. ''' + # MM: when decorating functions with cluster_runnable, provide + # them as kwargs, else will throw attribute error + function_name = func.__name__ def submit_function(*args, **kwargs): From b246f2f0d6c40217d1284fee2fac835be9864040 Mon Sep 17 00:00:00 2001 From: Sebastian Luna Valero Date: Fri, 7 Nov 2014 15:04:47 +0000 Subject: [PATCH 2/2] [ci skip] testing pyparsing>=1.5.7 --- requires.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requires.txt b/requires.txt index fb3aaa5f..f0fc163e 100644 --- a/requires.txt +++ b/requires.txt @@ -1,6 +1,6 @@ # latest setutools required for automatic cythonization setuptools>=1.1 -pyparsing==1.5.7 +pyparsing>=1.5.7 cython>=0.19 numpy>=1.7 MySQL-python>1.2.3