Skip to content

Commit f49b225

Browse files
authored
better move_outputs default value (#875)
* ensure tmpdir exists
1 parent 1cba828 commit f49b225

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ install-deb-dep:
6161
install: FORCE
6262
pip install .[deps]
6363

64+
## dev : install the ${MODULE} module in dev mode
65+
dev: install-dep
66+
pip install -e .[deps]
67+
68+
6469
## dist : create a module package for distribution
6570
dist: dist/${MODULE}-$(VERSION).tar.gz
6671

cwltool/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __init__(self, kwargs=None):
8888
self.rm_tmpdir = True # type: bool
8989
self.pull_image = True # type: bool
9090
self.rm_container = True # type: bool
91-
self.move_outputs = "" # type: Text
91+
self.move_outputs = "move" # type: Text
9292

9393
self.singularity = False # type: bool
9494
self.disable_net = None

cwltool/job.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,11 @@ def run(self,
374374
runtimeContext # type: RuntimeContext
375375
): # type: (...) -> None
376376

377+
if not os.path.exists(self.tmpdir):
378+
os.makedirs(self.tmpdir)
377379
self._setup(runtimeContext)
378380

379381
env = self.environment
380-
if not os.path.exists(self.tmpdir):
381-
os.makedirs(self.tmpdir)
382382
vars_to_preserve = runtimeContext.preserve_environment
383383
if runtimeContext.preserve_entire_environment:
384384
vars_to_preserve = os.environ
@@ -427,7 +427,8 @@ def create_runtime(self, env, runtimeContext):
427427

428428
def run(self, runtimeContext):
429429
# type: (RuntimeContext) -> None
430-
430+
if not os.path.exists(self.tmpdir):
431+
os.makedirs(self.tmpdir)
431432
(docker_req, docker_is_req) = self.get_requirement("DockerRequirement")
432433
self.prov_obj = runtimeContext.prov_obj
433434
img_id = None

0 commit comments

Comments
 (0)