type fixes for MyPy 1.7.0

common-workflow-language · Nov 13, 2023 · c2ab3cd · c2ab3cd
1 parent d943c6a
commit c2ab3cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cwl_utils/cwl_v1_0_expression_refactor.py b/cwl_utils/cwl_v1_0_expression_refactor.py
@@ -670,8 +670,8 @@ def process_workflow_reqs_and_hints(
     resourceReq: Optional[cwl.ResourceRequirement] = None
     envVarReq: Optional[cwl.EnvVarRequirement] = None
     iwdr: Optional[cwl.InitialWorkDirRequirement] = None
-    if workflow.requirements:
-        for req in workflow.requirements:
+    if workflow.requirements is not None:
+        for req in cast(List[cwl.ProcessRequirement], workflow.requirements):
             if req and isinstance(req, cwl.EnvVarRequirement):
                 if req.envDef:
                     for index, envDef in enumerate(req.envDef):
@@ -696,7 +696,7 @@ def process_workflow_reqs_and_hints(
                                     None,
                                     replace_etool,
                                 )
-                                if not envVarReq:
+                                if envVarReq is None:
                                     envVarReq = copy.deepcopy(req)
                                     prop_reqs += (cwl.EnvVarRequirement,)
                                 newEnvDef = copy.deepcopy(envDef)

diff --git a/cwl_utils/cwl_v1_1_expression_refactor.py b/cwl_utils/cwl_v1_1_expression_refactor.py
@@ -670,8 +670,8 @@ def process_workflow_reqs_and_hints(
     resourceReq: Optional[cwl.ResourceRequirement] = None
     envVarReq: Optional[cwl.EnvVarRequirement] = None
     iwdr: Optional[cwl.InitialWorkDirRequirement] = None
-    if workflow.requirements:
-        for req in workflow.requirements:
+    if workflow.requirements is not None:
+        for req in cast(List[cwl.ProcessRequirement], workflow.requirements):
             if req and isinstance(req, cwl.EnvVarRequirement):
                 if req.envDef:
                     for index, envDef in enumerate(req.envDef):
@@ -696,7 +696,7 @@ def process_workflow_reqs_and_hints(
                                     None,
                                     replace_etool,
                                 )
-                                if not envVarReq:
+                                if envVarReq is None:
                                     envVarReq = copy.deepcopy(req)
                                     prop_reqs += (cwl.EnvVarRequirement,)
                                 newEnvDef = copy.deepcopy(envDef)

diff --git a/cwl_utils/cwl_v1_2_expression_refactor.py b/cwl_utils/cwl_v1_2_expression_refactor.py
@@ -765,8 +765,8 @@ def process_workflow_reqs_and_hints(
     resourceReq: Optional[cwl.ResourceRequirement] = None
     envVarReq: Optional[cwl.EnvVarRequirement] = None
     iwdr: Optional[cwl.InitialWorkDirRequirement] = None
-    if workflow.requirements:
-        for req in workflow.requirements:
+    if workflow.requirements is not None:
+        for req in cast(List[cwl.ProcessRequirement], workflow.requirements):
             if req and isinstance(req, cwl.EnvVarRequirement):
                 if req.envDef:
                     for index, envDef in enumerate(req.envDef):
@@ -791,7 +791,7 @@ def process_workflow_reqs_and_hints(
                                     None,
                                     replace_etool,
                                 )
-                                if not envVarReq:
+                                if envVarReq is None:
                                     envVarReq = copy.deepcopy(req)
                                     prop_reqs += (cwl.EnvVarRequirement,)
                                 newEnvDef = copy.deepcopy(envDef)