change schema to match test dataset

R-ODAF · Nov 2, 2023 · aeb881f · aeb881f
1 parent 872a262
commit aeb881f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/workflow/schema/config.schema.yaml b/workflow/schema/config.schema.yaml
@@ -105,8 +105,10 @@ properties:
       treatment_var:
         type: string
       collapse_replicates:
-        type: string
-        enum: ["T", "F"]
+        anyOf:
+          - type: boolean
+          - type: string
+            enum: ["T", "F"]
       technical_control:
         type: string
       reference_rna:

diff --git a/workflow/schema/metadata.schema.yaml b/workflow/schema/metadata.schema.yaml
@@ -3,21 +3,27 @@ $schema: "https://json-schema.org/draft/2020-12/schema"
 description: an entry on the sample sheet
 
 properties:
-  sample_id:
+  sample_ID:
     type: string
     pattern: "^[a-zA-Z0-9-_]*$"
     description: The sample identifier column. No spaces or special characters allowed.
   technical_control:
-    type: string
-    enum: ["T", "F"]
+    anyOf:
+    - type: string
+      enum: ["T", "F"]
+    - type: boolean
     description: Defines whether a sample was a technical control
   reference_rna:
-    type: string
-    enum: ["T", "F"]
+    anyOf:
+    - type: string
+      enum: ["T", "F"]
+    - type: boolean
     description: Defines whether a sample was an RNA control in a TempO-Seq experiment
   solvent_control:
-    type: string
-    enum: ["T", "F"]
+    anyOf:
+    - type: string
+      enum: ["T", "F"]
+    - type: boolean
     description: Defines whether a sample was a solvent control
   dose:
     type: number
@@ -26,7 +32,7 @@ properties:
 
 
 required:
-  - sample_id
+  - sample_ID
   - technical_control
   - reference_rna
   - solvent_control