Fix type hints

Author: Peter Amstutz

cwltool/docker.py

@@ -11,7 +11,7 @@
 
 import datetime
 import requests
-from typing import (Dict, List, Text, Any, MutableMapping)
+from typing import (Dict, List, Text, Any, MutableMapping, Set)
 import threading
 
 from .docker_id import docker_vm_id
@@ -23,14 +23,14 @@
 
 _logger = logging.getLogger("cwltool")
 
-found_images = set()
+found_images = set()  # type: Set[Text]
 found_images_lock = threading.Lock()
 
 class DockerCommandLineJob(ContainerCommandLineJob):
 
     @staticmethod
     def get_image(dockerRequirement, pull_image, dry_run=False, force_pull=False):
-        # type: (Dict[Text, Text], bool, bool) -> bool
+        # type: (Dict[Text, Text], bool, bool, bool) -> bool
         found = False
 
         if "dockerImageId" not in dockerRequirement and "dockerPull" in dockerRequirement:

cwltool/job.py

@@ -337,8 +337,8 @@ class ContainerCommandLineJob(JobBase):
     __metaclass__ = ABCMeta
 
     @abstractmethod
-    def get_from_requirements(self, r, req, pull_image, dry_run=False):
-        # type: (Dict[Text, Text], bool, bool, bool) -> Text
+    def get_from_requirements(self, r, req, pull_image, dry_run=False, force_pull=False):
+        # type: (Dict[Text, Text], bool, bool, bool, bool) -> Text
         pass
 
     @abstractmethod

cwltool/singularity.py

@@ -21,13 +21,10 @@
 
 class SingularityCommandLineJob(ContainerCommandLineJob):
     @staticmethod
-    def get_image(dockerRequirement, pull_image, dry_run=False, force_pull=False):
+    def get_image(dockerRequirement, pull_image, dry_run=False):
         # type: (Dict[Text, Text], bool, bool) -> bool
         found = False
 
-        if force_pull:
-            _logger.warn("--force-docker-pull currently not supported for singularity")
-
         if "dockerImageId" not in dockerRequirement and "dockerPull" in dockerRequirement:
             match = re.search(pattern=r'([a-z]*://)', string=dockerRequirement["dockerPull"])
             if match:
@@ -72,9 +69,13 @@ def get_image(dockerRequirement, pull_image, dry_run=False, force_pull=False):
 
         return found
 
-    def get_from_requirements(self, r, req, pull_image, dry_run=False):
-        # type: (Dict[Text, Text], bool, bool, bool) -> Text
+    def get_from_requirements(self, r, req, pull_image, dry_run=False, force_pull=False):
+        # type: (Dict[Text, Text], bool, bool, bool, bool) -> Text
         # returns the filename of the Singularity image (e.g. hello-world-latest.img)
+
+        if force_pull:
+            _logger.warn("--force-docker-pull currently not supported for singularity")
+
         if r:
             errmsg = None
             try: