Author: Michael R. Crusoe <michael.crusoe@gmail.com>
Description: Adjust to newer version of cwltool
--- a/src/toil/cwl/cwltoil.py
+++ b/src/toil/cwl/cwltoil.py
@@ -41,6 +41,7 @@ import six
 from schema_salad import validate
 from schema_salad.schema import Names
 import schema_salad.ref_resolver
+from schema_salad.schema import Names
 
 import cwltool.errors
 import cwltool.load_tool
@@ -469,6 +470,7 @@ class CWLJobWrapper(Job):
         self.addChild(realjob)
         return realjob.rv()
 
+
 def _makeNestedTempDir(top, seed, levels=2):
     """
     Gets a temporary directory in the hierarchy of directories under a given
@@ -615,6 +617,7 @@ class CWLJob(Job):
 
         return output
 
+
 def makeJob(tool, jobobj, step_inputs, runtime_context):
     """Create the correct Toil Job object for the CWL tool (workflow, job, or job
     wrapper for dynamic resource requirements.)
@@ -1149,7 +1152,8 @@ def main(args=None, stdout=sys.stdout):
 
     if options.provisioner and not options.jobStore:
         raise NoSuchJobStoreException(
-            'Please specify a jobstore with the --jobStore option when specifying a provisioner.')
+            'Please specify a jobstore with the --jobStore option when '
+            'specifying a provisioner.')
 
     use_container = not options.no_container
 
@@ -1271,7 +1275,8 @@ def main(args=None, stdout=sys.stdout):
                 return 33
 
             wf1.cwljob = initialized_job_order
-            if wf1 is CWLJob:  # Clean up temporary directories only created with CWLJobs.
+            if wf1 is CWLJob:
+                # Clean up temporary directories only created with CWLJobs.
                 wf1.addFollowOnFn(cleanTempDirs, wf1)
             outobj = toil.start(wf1)
 
--- a/src/toil/jobGraph.py
+++ b/src/toil/jobGraph.py
@@ -103,6 +103,9 @@ class JobGraph(JobNode):
     def __hash__(self):
         return hash(self.jobStoreID)
 
+    def __hash__(self):
+        return hash(self.jobStoreID)
+
     def setupJobAfterFailure(self, config):
         """
         Reduce the remainingRetryCount if greater than zero and set the memory
