projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11557: Fixed the way that can_read permission link is created. Updated test.
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvworkflow.py
diff --git
a/sdk/cwl/arvados_cwl/arvworkflow.py
b/sdk/cwl/arvados_cwl/arvworkflow.py
index 4db1f4f2f4d8f48739bd7ef525e9526bdd2c3b4c..22f662e00a1a02579543d1ead9542bf3e74997f7 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/
sdk/cwl/arvados_cwl/arvworkflow.py
@@
-13,7
+13,8
@@
from cwltool.pathmapper import adjustFileObjs, adjustDirObjs
import ruamel.yaml as yaml
import ruamel.yaml as yaml
-from .runner import upload_dependencies, trim_listing, packed_workflow, upload_workflow_collection
+from .runner import upload_dependencies, packed_workflow, upload_workflow_collection, trim_anonymous_location
+from .pathmapper import trim_listing
from .arvtool import ArvadosCommandTool
from .perf import Perf
from .arvtool import ArvadosCommandTool
from .perf import Perf
@@
-26,6
+27,8
@@
def upload_workflow(arvRunner, tool, job_order, project_uuid, uuid=None,
packed = packed_workflow(arvRunner, tool)
adjustDirObjs(job_order, trim_listing)
packed = packed_workflow(arvRunner, tool)
adjustDirObjs(job_order, trim_listing)
+ adjustFileObjs(job_order, trim_anonymous_location)
+ adjustDirObjs(job_order, trim_anonymous_location)
main = [p for p in packed["$graph"] if p["id"] == "#main"][0]
for inp in main["inputs"]:
main = [p for p in packed["$graph"] if p["id"] == "#main"][0]
for inp in main["inputs"]: