Skip to content

Commit cab8929

Browse files
committed
regen CWL v1.[01] parsers using custom codgen branches
1 parent 4d1b211 commit cab8929

File tree

3 files changed

+110
-27
lines changed

3 files changed

+110
-27
lines changed

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ Regenerate parsers
148148
To regenerate install the ``schema_salad`` package and run:
149149

150150
``cwl_utils/parser/cwl_v1_0.py`` was created via
151-
``schema-salad-tool --codegen python https://github.com/common-workflow-language/common-workflow-language/raw/main/v1.0/CommonWorkflowLanguage.yml --codegen-parser-info "org.w3id.cwl.v1_0"``
151+
``schema-salad-tool --codegen python https://github.com/common-workflow-language/common-workflow-language/raw/codegen/v1.0/CommonWorkflowLanguage.yml --codegen-parser-info "org.w3id.cwl.v1_0" > cwl_utils/parser/cwl_v1_0.py``
152152

153153
``cwl_utils/parser/cwl_v1_1.py`` was created via
154-
``schema-salad-tool --codegen python https://github.com/common-workflow-language/cwl-v1.1/raw/main/CommonWorkflowLanguage.yml --codegen-parser-info "org.w3id.cwl.v1_1"``
154+
``schema-salad-tool --codegen python https://github.com/common-workflow-language/cwl-v1.1/raw/codegen/CommonWorkflowLanguage.yml --codegen-parser-info "org.w3id.cwl.v1_1" > cwl_utils/parser/cwl_v1_1.py``
155155

156156
``cwl_utils/parser/cwl_v1_2.py`` was created via
157-
``schema-salad-tool --codegen python https://github.com/common-workflow-language/cwl-v1.2/raw/1.2.1_proposed/CommonWorkflowLanguage.yml --codegen-parser-info "org.w3id.cwl.v1_2"``
157+
``schema-salad-tool --codegen python https://github.com/common-workflow-language/cwl-v1.2/raw/1.2.1_proposed/CommonWorkflowLanguage.yml --codegen-parser-info "org.w3id.cwl.v1_2" > cwl_utils/parser/cwl_v1_2.py``
158158

159159
Release
160160
~~~~~~~

cwl_utils/parser/cwl_v1_0.py

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3759,7 +3759,7 @@ def fromDoc(
37593759
try:
37603760
default = load_field(
37613761
_doc.get("default"),
3762-
union_of_None_type_or_Any_type,
3762+
union_of_None_type_or_FileLoader_or_DirectoryLoader_or_Any_type,
37633763
baseuri,
37643764
loadingOptions,
37653765
)
@@ -6785,7 +6785,7 @@ def fromDoc(
67856785
try:
67866786
default = load_field(
67876787
_doc.get("default"),
6788-
union_of_None_type_or_Any_type,
6788+
union_of_None_type_or_FileLoader_or_DirectoryLoader_or_Any_type,
67896789
baseuri,
67906790
loadingOptions,
67916791
)
@@ -7395,7 +7395,7 @@ def fromDoc(
73957395
try:
73967396
hints = load_field(
73977397
_doc.get("hints"),
7398-
idmap_hints_union_of_None_type_or_array_of_Any_type,
7398+
idmap_hints_union_of_None_type_or_array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type,
73997399
baseuri,
74007400
loadingOptions,
74017401
)
@@ -9605,7 +9605,7 @@ def fromDoc(
96059605
try:
96069606
hints = load_field(
96079607
_doc.get("hints"),
9608-
idmap_hints_union_of_None_type_or_array_of_Any_type,
9608+
idmap_hints_union_of_None_type_or_array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type,
96099609
baseuri,
96109610
loadingOptions,
96119611
)
@@ -10956,7 +10956,7 @@ class Workflow(Process):
1095610956
those steps. When a step produces output that will be consumed by a
1095710957
second step, the first step is a dependency of the second step.
1095810958
10959-
When there is a dependency, the workflow engine must execute the preceeding
10959+
When there is a dependency, the workflow engine must execute the preceding
1096010960
step and wait for it to successfully produce output before executing the
1096110961
dependent step. If two steps are defined in the workflow graph that
1096210962
are not directly or indirectly dependent, these steps are **independent**,
@@ -11130,7 +11130,7 @@ def fromDoc(
1113011130
try:
1113111131
hints = load_field(
1113211132
_doc.get("hints"),
11133-
idmap_hints_union_of_None_type_or_array_of_Any_type,
11133+
idmap_hints_union_of_None_type_or_array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type,
1113411134
baseuri,
1113511135
loadingOptions,
1113611136
)
@@ -12241,9 +12241,11 @@ def save(
1224112241
False,
1224212242
None,
1224312243
)
12244-
union_of_None_type_or_Any_type = _UnionLoader(
12244+
union_of_None_type_or_FileLoader_or_DirectoryLoader_or_Any_type = _UnionLoader(
1224512245
(
1224612246
None_type,
12247+
FileLoader,
12248+
DirectoryLoader,
1224712249
Any_type,
1224812250
)
1224912251
)
@@ -12310,15 +12312,36 @@ def save(
1231012312
"class",
1231112313
"None",
1231212314
)
12313-
array_of_Any_type = _ArrayLoader(Any_type)
12314-
union_of_None_type_or_array_of_Any_type = _UnionLoader(
12315+
union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type = _UnionLoader(
12316+
(
12317+
InlineJavascriptRequirementLoader,
12318+
SchemaDefRequirementLoader,
12319+
DockerRequirementLoader,
12320+
SoftwareRequirementLoader,
12321+
InitialWorkDirRequirementLoader,
12322+
EnvVarRequirementLoader,
12323+
ShellCommandRequirementLoader,
12324+
ResourceRequirementLoader,
12325+
SubworkflowFeatureRequirementLoader,
12326+
ScatterFeatureRequirementLoader,
12327+
MultipleInputFeatureRequirementLoader,
12328+
StepInputExpressionRequirementLoader,
12329+
Any_type,
12330+
)
12331+
)
12332+
array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type = _ArrayLoader(
12333+
union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type
12334+
)
12335+
union_of_None_type_or_array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type = _UnionLoader(
1231512336
(
1231612337
None_type,
12317-
array_of_Any_type,
12338+
array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type,
1231812339
)
1231912340
)
12320-
idmap_hints_union_of_None_type_or_array_of_Any_type = _IdMapLoader(
12321-
union_of_None_type_or_array_of_Any_type, "class", "None"
12341+
idmap_hints_union_of_None_type_or_array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type = _IdMapLoader(
12342+
union_of_None_type_or_array_of_union_of_InlineJavascriptRequirementLoader_or_SchemaDefRequirementLoader_or_DockerRequirementLoader_or_SoftwareRequirementLoader_or_InitialWorkDirRequirementLoader_or_EnvVarRequirementLoader_or_ShellCommandRequirementLoader_or_ResourceRequirementLoader_or_SubworkflowFeatureRequirementLoader_or_ScatterFeatureRequirementLoader_or_MultipleInputFeatureRequirementLoader_or_StepInputExpressionRequirementLoader_or_Any_type,
12343+
"class",
12344+
"None",
1232212345
)
1232312346
union_of_None_type_or_CWLVersionLoader = _UnionLoader(
1232412347
(
@@ -12575,6 +12598,12 @@ def save(
1257512598
uri_union_of_None_type_or_strtype_or_array_of_strtype_False_False_2 = _URILoader(
1257612599
union_of_None_type_or_strtype_or_array_of_strtype, False, False, 2
1257712600
)
12601+
union_of_None_type_or_Any_type = _UnionLoader(
12602+
(
12603+
None_type,
12604+
Any_type,
12605+
)
12606+
)
1257812607
array_of_WorkflowStepInputLoader = _ArrayLoader(WorkflowStepInputLoader)
1257912608
idmap_in__array_of_WorkflowStepInputLoader = _IdMapLoader(
1258012609
array_of_WorkflowStepInputLoader, "id", "source"
@@ -12599,6 +12628,16 @@ def save(
1259912628
None,
1260012629
)
1260112630
)
12631+
array_of_Any_type = _ArrayLoader(Any_type)
12632+
union_of_None_type_or_array_of_Any_type = _UnionLoader(
12633+
(
12634+
None_type,
12635+
array_of_Any_type,
12636+
)
12637+
)
12638+
idmap_hints_union_of_None_type_or_array_of_Any_type = _IdMapLoader(
12639+
union_of_None_type_or_array_of_Any_type, "class", "None"
12640+
)
1260212641
union_of_strtype_or_CommandLineToolLoader_or_ExpressionToolLoader_or_WorkflowLoader = (
1260312642
_UnionLoader(
1260412643
(

0 commit comments

Comments
 (0)