Updated CWL parsers

common-workflow-language · Dec 1, 2023 · 7e80015 · 7e80015
1 parent 62aa7bf
commit 7e80015
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/cwl_utils/parser/cwl_v1_0.py b/cwl_utils/parser/cwl_v1_0.py
@@ -75,7 +75,7 @@ def __init__(
         idx: Optional[IdxType] = None,
         imports: Optional[List[str]] = None,
         includes: Optional[List[str]] = None,
-        no_link_check: Optional[bool] = None,
+        no_link_check: bool = False,
     ) -> None:
         """Create a LoadingOptions object."""
         self.original_doc = original_doc
@@ -120,10 +120,7 @@ def __init__(
         else:
             self.includes = copyfrom.includes if copyfrom is not None else []
 
-        if no_link_check is not None:
-            self.no_link_check = no_link_check
-        else:
-            self.no_link_check = copyfrom.no_link_check if copyfrom is not None else False
+        self.no_link_check = no_link_check
 
         if fetcher is not None:
             self.fetcher = fetcher

diff --git a/cwl_utils/parser/cwl_v1_1.py b/cwl_utils/parser/cwl_v1_1.py
@@ -75,7 +75,7 @@ def __init__(
         idx: Optional[IdxType] = None,
         imports: Optional[List[str]] = None,
         includes: Optional[List[str]] = None,
-        no_link_check: Optional[bool] = None,
+        no_link_check: bool = False,
     ) -> None:
         """Create a LoadingOptions object."""
         self.original_doc = original_doc
@@ -120,10 +120,7 @@ def __init__(
         else:
             self.includes = copyfrom.includes if copyfrom is not None else []
 
-        if no_link_check is not None:
-            self.no_link_check = no_link_check
-        else:
-            self.no_link_check = copyfrom.no_link_check if copyfrom is not None else False
+        self.no_link_check = no_link_check
 
         if fetcher is not None:
             self.fetcher = fetcher

diff --git a/cwl_utils/parser/cwl_v1_2.py b/cwl_utils/parser/cwl_v1_2.py
@@ -75,7 +75,7 @@ def __init__(
         idx: Optional[IdxType] = None,
         imports: Optional[List[str]] = None,
         includes: Optional[List[str]] = None,
-        no_link_check: Optional[bool] = None,
+        no_link_check: bool = False,
     ) -> None:
         """Create a LoadingOptions object."""
         self.original_doc = original_doc
@@ -120,10 +120,7 @@ def __init__(
         else:
             self.includes = copyfrom.includes if copyfrom is not None else []
 
-        if no_link_check is not None:
-            self.no_link_check = no_link_check
-        else:
-            self.no_link_check = copyfrom.no_link_check if copyfrom is not None else False
+        self.no_link_check = no_link_check
 
         if fetcher is not None:
             self.fetcher = fetcher

diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,5 @@ cwl-upgrader >= 1.2.3
 packaging
 rdflib
 requests
-schema-salad >= 8.3.20220825114525, < 9
+schema-salad @ git+https://github.com/common-workflow-language/schema_salad.git@refs/pull/672/head
 ruamel.yaml >= 0.17.6, < 0.19