fixes for docker-toolbox

Author: mr-c

cwltool/utils.py

@@ -3,6 +3,7 @@
 # no imports from cwltool allowed
 
 import os
+import platform
 import shutil
 import stat
 from typing import Any, Callable, Dict, List, Text, Tuple, Union
@@ -67,7 +68,10 @@ def docker_windows_path_adjust(path):
     if path is not None and onWindows():
         sp=path.split(':')
         if len(sp)==2:
-            sp[0]=sp[0].capitalize()  # Capitalizing windows Drive letters
+            if platform.win32_ver()[0] < 9:
+                sp[0]=sp[0].lower()  # Docker toolbox uses lowecase windows Drive letters
+            else:
+                sp[0]=sp[0].capitalize()  # Docker for Windows uses uppercase windows Drive letters
             path=':'.join(sp)
         path = path.replace(':', '').replace('\\', '/')
         return path if path[0] == '/' else '/' + path

tests/test_pack.py

@@ -105,7 +105,7 @@ def test_packed_workflow_execution(self):
         document_loader, avsc_names, processobj, metadata, uri = validate_document(
             document_loader, workflowobj, uri)
         packed = json.loads(print_pack(document_loader, processobj, uri, metadata))
-        temp_packed_path = tempfile.mkstemp()[1]
+        temp_packed_handle, temp_packed_path = tempfile.mkstemp()
         with open(temp_packed_path, 'w') as f:
             json.dump(packed, f)
         normal_output = StringIO()
@@ -117,6 +117,7 @@ def test_packed_workflow_execution(self):
                                 get_data(test_wf_job)],
                                stdout=normal_output), 0)
         self.assertEquals(json.loads(packed_output.getvalue()), json.loads(normal_output.getvalue()))
+        os.close(temp_packed_handle)
         os.remove(temp_packed_path)
 
     @needs_docker
@@ -129,7 +130,7 @@ def test_preserving_namespaces(self):
             document_loader, workflowobj, uri)
         packed = json.loads(print_pack(document_loader, processobj, uri, metadata))
         assert "$namespaces" in packed
-        temp_packed_path = tempfile.mkstemp()[1]
+        temp_packed_handle, temp_packed_path = tempfile.mkstemp()
         with open(temp_packed_path, 'w') as f:
             json.dump(packed, f)
         normal_output = StringIO()
@@ -141,4 +142,5 @@ def test_preserving_namespaces(self):
                                 get_data(test_wf_job)],
                                stdout=normal_output), 0)
         self.assertEquals(json.loads(packed_output.getvalue()), json.loads(normal_output.getvalue()))
+        os.close(temp_packed_handle)
         os.remove(temp_packed_path)

windowsdoc.md

@@ -1,17 +1,19 @@
 # Windows Compatibility
-cwltool is compatible with Windows. This means that you can create and run CWL
-workflows on Windows. On Windows, all workflows and tools are executed in
-[Docker Containers](https://docs.docker.com/docker-for-windows/). The default
-Docker Container is
+The CWL reference runner, cwltool, is compatible with Microsoft Windows when
+Docker is installed. On Windows, all CWL CommandLineTools are executed using
+[Docker software containers](https://docs.docker.com/docker-for-windows/). The
+default Docker Container is
 [Alpine with Bash support](https://github.com/frol/docker-alpine-bash). You can
 specify other Docker Containers for your tools and workflows using hints,
 [requirements](http://www.commonwl.org/v1.0/CommandLineTool.html#DockerRequirement)),
 or the `--default-container` cwltool option.
 
 ## Supported Windows versions
 * Windows 10 with native [Docker for Windows](https://docs.docker.com/docker-for-windows/).
-* Windows 8.1 with [Docker ToolBox](https://docs.docker.com/toolbox/toolbox_install_windows/).
-* Windows 7 & 8 with Docker ToolBox may work (Not tested, please let us know!).
+* Windows 7, 8, and 8.1 with [Docker ToolBox](https://docs.docker.com/toolbox/toolbox_install_windows/).
+
+If you are using Docker Toolbox, then you must run cwltool in the Docker
+Quickstart Terminal.
 
 ## Installation
 
@@ -26,7 +28,7 @@ Before installing cwltool, please install:
 * [Node.js](https://nodejs.org/en/download/) (optional, please install if your
   workflows or tools contain [Javascript Expressions](http://www.commonwl.org/v1.0/CommandLineTool.html#InlineJavascriptRequirement))
 
-### Install using pip
+### Install using pip (recommended)
 
 ```
 pip install cwltool
@@ -58,18 +60,25 @@ There are two types of tests available for cwltool: unit tests and conformance t
 
 ### Unit tests
 
-To run cwltool's unit tests, go to the cwltool repository on your system and run:
+To run cwltool's unit tests, run the following command:
+```
+python -m pytest --pyarg cwltool
+```
+
+Or go to the checkout of the cwltool Git repository on your system and run:
 
 ```
 python setup.py test
 ```
 
+
+
 ### Conformance tests
 
-To run the conformance tests, follow these instructions:
+To run the CWL conformance tests, follow these instructions:
 
 ```
-pip install cwltest  
+pip install cwltest mock 
 git clone https://github.com/common-workflow-language/common-workflow-language.git   
 cd common-workflow-language/v1.0  
 cwltest --test conformance_test_v1.0.yaml -j 4 --tool cwltool
@@ -130,3 +139,4 @@ can't then use the `--eval-timeout` argument and set a higher timeout value.
 *If you still have problems with setting up and using Docker on Windows, please
 consult the online Docker Community. If the problem is specific to cwltool,
 create an [issue on cwltool](https://github.com/common-workflow-language/cwltool/issues).*
+