1- from cwl_utils .parser .cwl_v1_2 import ResourceRequirement , WorkflowStep , Workflow , CommandLineTool , save
1+ from typing import Optional , List , Any
2+
3+ from cwl_utils .parser .cwl_v1_2 import (
4+ ResourceRequirement ,
5+ WorkflowStep ,
6+ Workflow ,
7+ CommandLineTool ,
8+ save ,
9+ )
210import pytest
311from schema_salad .exceptions import ValidationException
412
13+
514# Helper functions
6- def create_commandlinetool (requirements = None , inputs = None , outputs = None ):
15+ def create_commandlinetool (
16+ requirements : Optional [List [Any ]] = None ,
17+ inputs : Optional [List [Any ]] = None ,
18+ outputs : Optional [List [Any ]] = None ,
19+ ) -> CommandLineTool :
720 return CommandLineTool (
821 requirements = requirements or [],
922 inputs = inputs or [],
1023 outputs = outputs or [],
1124 )
1225
1326
14- def create_workflow (requirements = None , steps = None , inputs = None , outputs = None ):
27+ def create_workflow (
28+ requirements : Optional [List [Any ]] = None ,
29+ steps : Optional [List [Any ]] = None ,
30+ inputs : Optional [List [Any ]] = None ,
31+ outputs : Optional [List [Any ]] = None ,
32+ ) -> Workflow :
1533 return Workflow (
1634 requirements = requirements or [],
1735 steps = steps or [],
@@ -20,14 +38,20 @@ def create_workflow(requirements=None, steps=None, inputs=None, outputs=None):
2038 )
2139
2240
23- def create_step (requirements = None , run = None , in_ = None , out = None ):
41+ def create_step (
42+ requirements : Optional [List [Any ]] = None ,
43+ run : Any = None ,
44+ in_ : Optional [List [Any ]] = None ,
45+ out : Optional [List [Any ]] = None ,
46+ ) -> WorkflowStep :
2447 return WorkflowStep (
2548 requirements = requirements or [],
2649 run = run ,
2750 in_ = in_ or [],
2851 out = out or [],
2952 )
3053
54+
3155@pytest .mark .parametrize (
3256 "bad_min_max_reqs" ,
3357 [
@@ -41,10 +65,8 @@ def create_step(requirements=None, run=None, in_=None, out=None):
4165 ResourceRequirement (outdirMin = 512 , outdirMax = 256 ),
4266 ],
4367)
44- def test_bad_min_max_resource_reqs (bad_min_max_reqs ):
45- """
46- Test invalid min/max resource requirements in CWL objects.
47- """
68+ def test_bad_min_max_resource_reqs (bad_min_max_reqs : ResourceRequirement ) -> None :
69+ # Test invalid min/max resource requirements in CWL objects.
4870
4971 # CommandlineTool with bad minmax reqs
5072 clt = create_commandlinetool (requirements = [bad_min_max_reqs ])
0 commit comments