Merge pull request #408 from kapilkd13/master

mr-c · web-flow · commit 0f288960cb67 · 2017-07-07T18:15:24.000+03:00
changes to enable nolinkcheck in case of default field, related to cwltool issue#2
diff --git a/v1.0/Process.yml b/v1.0/Process.yml
@@ -563,7 +563,9 @@ $graph:
 
     - name: default
       type: Any?
-      jsonldPredicate: "cwl:default"
+      jsonldPredicate:
+        _id: cwl:default
+        noLinkCheck: true
       doc: |
         The default value for this parameter if not provided in the input
         object.
diff --git a/v1.0/Workflow.yml b/v1.0/Workflow.yml
@@ -261,7 +261,9 @@ $graph:
       doc: |
         The default value for this parameter if there is no `source`
         field.
-      jsonldPredicate: "cwl:default"
+      jsonldPredicate:
+        _id: "cwl:default"
+        noLinkCheck: true
     - name: valueFrom
       type:
         - "null"
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -982,9 +982,13 @@
   tool: v1.0/imported-hint.cwl
   doc: Test hints with $import
 
+- output: {}
+  job: v1.0/default_path_job.yml
+  tool: v1.0/default_path.cwl
+  doc: Test warning instead of error when default path is not found
+
 - output:
     args: [-A,'2',-B,baz,-C,'10','9','8','7','6','5','4','3','2','1']
   job: v1.0/empty.json
   tool: v1.0/inline-js.cwl
-  doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
-
+  doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
diff --git a/v1.0/v1.0/default_path.cwl b/v1.0/v1.0/default_path.cwl
@@ -0,0 +1,10 @@
+cwlVersion: v1.0
+class: CommandLineTool
+inputs:
+  - id: "file1"
+    type: File
+    default:
+      class: File
+      path: default.txt
+outputs: []
+arguments: [cat,$(inputs.file1.path)]
diff --git a/v1.0/v1.0/default_path_job.yml b/v1.0/v1.0/default_path_job.yml
@@ -0,0 +1,3 @@
+file1:
+  class: File
+  path: hello.txt
diff --git a/v1.1.0-dev1/Process.yml b/v1.1.0-dev1/Process.yml
@@ -564,7 +564,9 @@ $graph:
 
     - name: default
       type: Any?
-      jsonldPredicate: "cwl:default"
+      jsonldPredicate:
+        _id: cwl:default
+        noLinkCheck: true
       doc: |
         The default value for this parameter if not provided in the input
         object.
diff --git a/v1.1.0-dev1/Workflow.yml b/v1.1.0-dev1/Workflow.yml
@@ -267,7 +267,9 @@ $graph:
       doc: |
         The default value for this parameter if there is no `source`
         field.
-      jsonldPredicate: "cwl:default"
+      jsonldPredicate:
+        _id: "cwl:default"
+        noLinkCheck: true
     - name: valueFrom
       type:
         - "null"
diff --git a/v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml b/v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml
@@ -992,3 +992,8 @@
       size: 15
   tool: v1.1.0-dev1/imported-hint.cwl
   doc: Test hints with $import
+
+- output: {}
+  job: v1.0/default_path_job.yml
+  tool: v1.0/default_path.cwl
+  doc: Test warning instead of error when default path is not found
diff --git a/v1.1.0-dev1/v1.1.0-dev1/default_path.cwl b/v1.1.0-dev1/v1.1.0-dev1/default_path.cwl
@@ -0,0 +1,10 @@
+cwlVersion: v1.0
+class: CommandLineTool
+inputs:
+  - id: "file1"
+    type: File
+    default:
+      class: File
+      path: default.txt
+outputs: []
+arguments: [cat,$(inputs.file1.path)]
diff --git a/v1.1.0-dev1/v1.1.0-dev1/default_path_job.yml b/v1.1.0-dev1/v1.1.0-dev1/default_path_job.yml
@@ -0,0 +1,3 @@
+file1:
+  class: File
+  path: hello.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+file1:`
	`2`	`+ class: File`
	`3`	`+ path: hello.txt`