projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9307-cwl-use-tmp-output
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
runner.py
diff --git
a/sdk/cwl/arvados_cwl/runner.py
b/sdk/cwl/arvados_cwl/runner.py
index 08e7d02486c503b9b9b4004789c2ebfda06f86a5..e5b4e006e8cce7cac780436fc06c6dcd79882730 100644
(file)
--- a/
sdk/cwl/arvados_cwl/runner.py
+++ b/
sdk/cwl/arvados_cwl/runner.py
@@
-21,7
+21,7
@@
from .pathmapper import ArvPathMapper
logger = logging.getLogger('arvados.cwl-runner')
logger = logging.getLogger('arvados.cwl-runner')
-cwltool.draft2tool.ACCEPTLIST_RE = re.compile(r"
^[a-zA-Z0-9._+-]+$
")
+cwltool.draft2tool.ACCEPTLIST_RE = re.compile(r"
.*
")
def trim_listing(obj):
"""Remove 'listing' field from Directory objects that are keep references.
def trim_listing(obj):
"""Remove 'listing' field from Directory objects that are keep references.
@@
-114,7
+114,7
@@
def upload_docker(arvrunner, tool):
class Runner(object):
class Runner(object):
- def __init__(self, runner, tool, job_order, enable_reuse):
+ def __init__(self, runner, tool, job_order, enable_reuse
, output_name
):
self.arvrunner = runner
self.tool = tool
self.job_order = job_order
self.arvrunner = runner
self.tool = tool
self.job_order = job_order
@@
-122,6
+122,7
@@
class Runner(object):
self.enable_reuse = enable_reuse
self.uuid = None
self.final_output = None
self.enable_reuse = enable_reuse
self.uuid = None
self.final_output = None
+ self.output_name = output_name
def update_pipeline_component(self, record):
pass
def update_pipeline_component(self, record):
pass