Merge branch 'master' into singularity-support

# Conflicts:
#	cwltool/job.py

Author: Anton Khodak

cwltool/docker.py

@@ -159,7 +159,7 @@ def add_volumes(self, pathmapper, runtime):
                     ensure_writable(host_outdir_tgt)
             elif vol.type == "WritableDirectory":
                 if vol.resolved.startswith("_:"):
-                    os.makedirs(vol.target, 0o0755)
+                    os.makedirs(host_outdir_tgt, 0o0755)
                 else:
                     if self.inplace_update:
                         runtime.append(u"--volume=%s:%s:rw" % (

cwltool/job.py

@@ -324,7 +324,6 @@ def create_runtime(self, env, rm_container=True, **kwargs):
         # type: (MutableMapping[Text, Text], bool, **Any) -> List
         pass
 
-
     def run(self, pull_image=True, rm_container=True,
             rm_tmpdir=True, move_outputs="move", **kwargs):
         # type: (bool, bool, bool, Text, **Any) -> None