Merge pull request #94 from HumanCellAtlas/v4.4.0_minorRelease

Updated sample_bundle.json to have core property and array of samples.
HumanCellAtlas · Dec 8, 2017 · 8a0eac8 · 8a0eac8
2 parents d238f40 + f6da795
commit 8a0eac8
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/json_schema/sample_bundle.json b/json_schema/sample_bundle.json
@@ -3,9 +3,8 @@
         "sample_ingest": {
             "required": [
                 "hca_ingest", 
-                "content",
-                "core"
-            ], 
+                "content"
+            ],
             "type": "object", 
             "properties": {
                 "content": {
@@ -28,18 +27,23 @@
                 "derived_from": {
                     "type": "string",
                     "description": "The sample that this sample was derived from."
-                },
-                "core": {
-                    "description": "Type and schema for this object.",
-                    "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/core.json"
                 }
             }
         }
     }, 
     "$schema": "http://json-schema.org/draft-04/schema#", 
-    "type": "array", 
+    "type": "object",
     "description": "A schema for a sample bundle", 
-    "items": {
-        "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/sample_bundle.json#/definitions/sample_ingest"
+    "properties" : {
+        "core": {
+            "description": "Type and schema for this object.",
+            "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/core.json"
+        },
+        "samples" : {
+            "type" : "array",
+            "items": {
+                "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/sample_bundle.json#/definitions/sample_ingest"
+            }
+        }
     }
 }