Adding labels and other annotations

Arvados-DCO-1.1-Signed-off-by: Sarah Wait Zaranek <swz@curii.com>
no issue #

diff --git a/WGS-processing/cwl/helper/bwamem-samtools-view.cwl b/WGS-processing/cwl/helper/bwamem-samtools-view.cwl
index c539325544572fc3968cb979fe4617723f26601a..0ad81840545acc43bcade1875b554fa0a4086859 100644 (file)
--- a/WGS-processing/cwl/helper/bwamem-samtools-view.cwl
+++ b/WGS-processing/cwl/helper/bwamem-samtools-view.cwl
@@ -1,10 +1,6 @@
 cwlVersion: v1.1
 class: CommandLineTool
-label: Aligning fastqs with BWA
-
-$namespaces:
-  arv: "http://arvados.org/cwl#"
-  cwltool: "http://commonwl.org/cwltool#"
+label: Align FASTQs with BWA
 
 requirements:
   DockerRequirement:
@@ -18,10 +14,20 @@ hints:
   arv:RuntimeConstraints:
     keep_cache: 1024 
     outputDirType: keep_output_dir
+  SoftwareRequirement:
+    packages:
+      BWA:
+        specs: [ "https://identifiers.org/rrid/RRID:SCR_010910" ]
+        version: [ "0.7.17" ]
+      Samtools:
+        specs: [ "https://identifiers.org/rrid/RRID:SCR_002105" ]
+        version: [ "1.10" ]
 
 inputs:
   reference:
     type: File
+    format: edam:format_1929 # FASTA
+    label: Reference genome
     secondaryFiles:
       - .amb
       - .ann
@@ -30,15 +36,25 @@ inputs:
       - .sa
       - .fai
       - ^.dict
-  fastq1: File
-  fastq2: File
-  sample: string
+  fastq1: 
+    type: File
+    format: edam:format_1930 # FASTQ
+    label: One of set of pair-end FASTQs (R1)
+  fastq2: 
+    type: File
+    format: edam:format_1930 # FASTQ
+    label: One of set of pair-end FASTQs (R2)
+  sample: 
+    type: string
+    label: Sample Name
 
 stdout: $(inputs.sample).bam
 
 outputs:
   bam:
     type: File
+    format: edam:format_2572 # BAM
+    label: Alignments in BAM format
     outputBinding:
       glob: "*bam"
 
@@ -65,3 +81,16 @@ arguments:
   - -S
   - shellQuote: false
     valueFrom: '-'
+
+s:codeRepository: https://github.com/arvados/arvados-tutorial
+s:license: https://www.gnu.org/licenses/agpl-3.0.en.html
+
+$namespaces:
+ s: https://schema.org/
+ edam: http://edamontology.org/
+ arv: "http://arvados.org/cwl#"
+ cwltool: "http://commonwl.org/cwltool#"
+
+$schemas:
+ - https://schema.org/version/latest/schema.rdf
+ - http://edamontology.org/EDAM_1.18.owl

diff --git a/WGS-processing/cwl/helper/fastqc.cwl b/WGS-processing/cwl/helper/fastqc.cwl
index e91e88e6e5c0af25a76b7d0e002124ecbc3e9d86..852c82b576a9b6cf356718db27a288e50d3f625f 100644 (file)
--- a/WGS-processing/cwl/helper/fastqc.cwl
+++ b/WGS-processing/cwl/helper/fastqc.cwl
@@ -37,7 +37,6 @@ outputs:
   out-zip:
     type: File[]
     label: Zip files of FASTQ QC report and associated data
-    outputSource: fastqc/out-zip
     outputBinding:
       glob: "*fastqc.zip"