Merge pull request #56 in SAT/pypeflow from feature/SE-2388-sort-patt…

…ern-matches to develop * commit '3957a5aef28aaf6de5be9a6819737eab2090dfdd': Sort for ALL and patterns
PacificBiosciences · Apr 23, 2019 · 51f00e0 · 51f00e0
2 parents 169af8b + 3957a5a
commit 51f00e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pypeflow/do_task.py b/pypeflow/do_task.py
@@ -142,7 +142,7 @@ def __getattr__(self, name):
             result = self.kwds.itervalues()
         else:
             result = [str(self.kwds[name])]
-        return ' '.join(self.quote(v) for v in result)
+        return ' '.join(self.quote(v) for v in sorted(result))
     def __init__(self, kwds, quote=quote):
         self.kwds = kwds
         self.quote = quote

diff --git a/test/test_do_task.py b/test/test_do_task.py
@@ -35,15 +35,15 @@
 echo PP
 """),
         # input.i* (with quoting)
-        ({'ii': 'II', 'ij': 'I J', 'ab': 'AB'}, {'oo': 'OO'}, {'pp': 'PP'},
+        ({'ii': 'II', 'ij': 'I J', 'ia': 'IA', 'ab': 'AB'}, {'oo': 'OO'}, {'pp': 'PP'},
 """\
 echo {input.i*}
 echo {input.ab}
 echo {output.oo}
 echo {params.pp}
 """,
 """\
-echo II 'I J'
+echo 'I J' IA II
 echo AB
 echo OO
 echo PP