Merge branch 'master' of ssh://github.com/CGATOxford/cgat

CGATOxford · Nov 7, 2014 · 7e31900 · 7e31900
2 parents 5004a6a + b246f2f
commit 7e31900
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CGAT/Pipeline.py b/CGAT/Pipeline.py
@@ -2176,8 +2176,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):

diff --git 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