Use custom set to uniquenames() when workflow packing. (#273)

Author: tetron

cwltool/pack.py

@@ -59,15 +59,16 @@ def loadref(b, u):
     for f in fdeps:
         find_run(document_loader.idx[f], runs)
 
+    names = set()  # type: Set[Text]
     rewrite = {}
     if isinstance(processobj, list):
         for p in processobj:
-            rewrite[p["id"]] = "#" + uniquename(shortname(p["id"]))
+            rewrite[p["id"]] = "#" + uniquename(shortname(p["id"]), names)
     else:
         rewrite[uri] = "#main"
 
     for r in sorted(runs):
-        rewrite[r] = "#" + uniquename(shortname(r))
+        rewrite[r] = "#" + uniquename(shortname(r), names)
 
     packed = {"$graph": [], "cwlVersion": metadata["cwlVersion"]
             }  # type: Dict[Text, Any]

cwltool/process.py

@@ -610,14 +610,16 @@ def empty_subtree(dirpath):  # type: (Text) -> bool
 
 _names = set()  # type: Set[Text]
 
-
-def uniquename(stem):  # type: (Text) -> Text
+def uniquename(stem, names=None):  # type: (Text, Set[Text]) -> Text
+    global _names
+    if names is None:
+        names = _names
     c = 1
     u = stem
-    while u in _names:
+    while u in names:
         c += 1
         u = u"%s_%s" % (stem, c)
-    _names.add(u)
+    names.add(u)
     return u
 
 def nestdir(base, deps):