Merge pull request #13 from jeevangelista/master

v3
MaayanLab · May 3, 2019 · c3c3a1d · c3c3a1d
2 parents 6020cfe + 227747b
commit c3c3a1d
Show file tree

Hide file tree

Showing 34 changed files with 174 additions and 1,219 deletions.
diff --git a/core/entity.json b/core/entity.json
@@ -1,9 +1,9 @@
 {
-  "$id": "/@dcic/signature-commons-schema/core/entity.json",
+  "$id": "/@dcic/signature-commons-schema/v3/core/entity.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",
@@ -13,7 +13,7 @@
           "description": "Globally unique identifier referring to this entity."
         },
         "meta": {
-          "$ref": "/@dcic/signature-commons-schema/core/meta.json",
+          "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json",
           "description": "Arbitrary validatable metadata describing the entity"
         },
         "signatures": {

diff --git a/core/entity.test.json b/core/entity.test.json
@@ -1,15 +1,15 @@
 {
-  "$validator": "/@dcic/signature-commons-schema/core/examples.json",
+  "$validator": "/@dcic/signature-commons-schema/v3/core/examples.json",
   "tests": [
     {
       "name": "Entity (Valid)",
       "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/entity.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/entity.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/entity.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/entity.json",
         "id": "2",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/entity/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/entity/sigcom.json",
           "Name": "STAT3",
           "Synonyms": [
             "STAT3",
@@ -30,12 +30,12 @@
     {
       "name": "Entity (Invalid)",
       "valid": false,
-      "schema": "/@dcic/signature-commons-schema/core/entity.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/entity.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/entity.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/entity.json",
         "id": "2",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/entity/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/entity/sigcom.json",
           "al_iases": [
             "STAT3",
             "NCBI:6774",

diff --git a/core/examples.json b/core/examples.json
@@ -1,10 +1,10 @@
 {
-  "$id": "/@dcic/signature-commons-schema/core/examples.json",
+  "$id": "/@dcic/signature-commons-schema/v3/core/examples.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "The schema describing the examples for testing",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",

diff --git a/core/library.json b/core/library.json
@@ -1,9 +1,9 @@
 {
-  "$id": "/@dcic/signature-commons-schema/core/library.json",
+  "$id": "/@dcic/signature-commons-schema/v3/core/library.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",
@@ -13,7 +13,7 @@
           "description": "Globally unique identifier referring to this library."
         },
         "meta": {
-          "$ref": "/@dcic/signature-commons-schema/core/meta.json",
+          "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json",
           "description": "Arbitrary validatable metadata describing the library"
         },
         "dataset": {

diff --git a/core/library.test.json b/core/library.test.json
@@ -1,15 +1,15 @@
 {
-  "$validator": "/@dcic/signature-commons-schema/core/examples.json",
+  "$validator": "/@dcic/signature-commons-schema/v3/core/examples.json",
   "tests": [
     {
       "name": "Library (Valid)",
       "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/library.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/library.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/library.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/library.json",
         "id": "0",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/library/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/library/sigcom.json",
           "Description": "My random description",
           "Spec": "hmm",
           "Access_URL": "http://website.com",
@@ -36,12 +36,12 @@
     {
       "name": "Library (Invalid)",
       "valid": false,
-      "schema": "/@dcic/signature-commons-schema/core/library.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/library.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/library.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/library.json",
         "id": "0",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/library/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/library/sigcom.json",
           "Description": 5
         },
         "signatures": [

diff --git a/core/meta.json b/core/meta.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/core/meta.json",
+  "$id": "/@dcic/signature-commons-schema/v3/core/meta.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "$validator": {

diff --git a/core/signature.json b/core/signature.json
@@ -1,9 +1,9 @@
 {
-  "$id": "/@dcic/signature-commons-schema/core/signature.json",
+  "$id": "/@dcic/signature-commons-schema/v3/core/signature.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",
@@ -13,7 +13,7 @@
           "description": "Globally unique identifier referring to this signature."
         },
         "meta": {
-          "$ref": "/@dcic/signature-commons-schema/core/meta.json",
+          "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json",
           "description": "Arbitrary validatable metadata describing the library"
         },
         "library": {

diff --git a/core/signature.test.json b/core/signature.test.json
@@ -1,16 +1,16 @@
 {
-  "$validator": "/@dcic/signature-commons-schema/core/examples.json",
+  "$validator": "/@dcic/signature-commons-schema/v3/core/examples.json",
   "tests": [
     {
       "name": "Signature (Valid)",
       "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/signature.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/signature.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/signature.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/signature.json",
         "id": "1",
         "library": "0",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/signature/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/signature/sigcom.json",
           "Assay": "microarray",
           "Gene": [
             {
@@ -35,13 +35,13 @@
     {
       "name": "Signature Organism (Invalid)",
       "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/signature.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/signature.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/signature.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/signature.json",
         "id": "1",
         "library": "0",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/signature/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/signature/sigcom.json",
           "Assay": "microarray",
           "Gene": [
             {
@@ -66,11 +66,11 @@
     {
       "name": "Signature (Invalid)",
       "valid": false,
-      "schema": "/@dcic/signature-commons-schema/core/signature.json",
+      "schema": "/@dcic/signature-commons-schema/v3/core/signature.json",
       "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/signature.json",
+        "$validator": "/@dcic/signature-commons-schema/v3/core/signature.json",
         "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta/signature/draft-1.json",
+          "$validator": "/@dcic/signature-commons-schema/v3/meta/signature/sigcom.json",
           "Assay": []
         },
         "id": "1"

diff --git a/core/unknown.json b/core/unknown.json
@@ -1,10 +1,10 @@
 {
-  "$id": "/@dcic/signature-commons-schema/core/examples.json",
+  "$id": "/@dcic/signature-commons-schema/v3/core/examples.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "A filler schema for use when one is not yet known.",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     }
   ]
 }
diff --git a/meta/entity/draft-2.json b/meta/entity/draft-2.json
diff --git a/meta/entity/ilincs-compound.json b/meta/entity/ilincs-compound.json
@@ -1,10 +1,10 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta/entity/ilincs-compound.json",
+  "$id": "/@dcic/signature-commons-schema/v3/meta/entity/ilincs-compound.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Compound metadata as described by http://www.ilincs.org/ilincs.json",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",

diff --git a/meta/entity/ilincs-gene.json b/meta/entity/ilincs-gene.json
@@ -1,10 +1,10 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta/entity/ilincs-gene.json",
+  "$id": "/@dcic/signature-commons-schema/v3/meta/entity/ilincs-gene.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Gene metadata as described by http://www.ilincs.org/ilincs.json",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",

diff --git a/meta/entity/draft-1.json → meta/entity/sigcom.json b/meta/entity/draft-1.json → meta/entity/sigcom.json
@@ -1,9 +1,9 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta/entity/draft-1.json",
+  "$id": "/@dcic/signature-commons-schema/v3/meta/entity/sigcom.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
+      "$ref": "/@dcic/signature-commons-schema/v3/core/meta.json"
     },
     {
       "type": "object",