Merge pull request #14 from uc-cdis/fix/schema

fix(schema): add required fields
uc-cdis · Apr 13, 2018 · afe22e1 · afe22e1
2 parents f042912 + 2ea94de
commit afe22e1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/dictionaryutils/schema_test.py b/dictionaryutils/schema_test.py
@@ -30,13 +30,15 @@ def load_project_specific_schema():
     projects = {}
     if os.path.exists(project_path):
         for fp in os.listdir(project_path):
-            projects[fp.replace('.yaml', '')] = load_yaml_schema(fp)
+            path = os.path.join(project_path, fp)
+            projects[fp.replace('.yaml', '')] = load_yaml_schema(path)
     return projects
 
 
 CUR_DIR = os.path.dirname(SCHEMA_DIR)
 
 DATA_DIR = os.path.join(CUR_DIR, 'examples')
+projects = load_project_specific_schema()
 
 
 def merge_schemas(a, b, path=None):

diff --git a/dictionaryutils/schemas/data_release.yaml b/dictionaryutils/schemas/data_release.yaml
@@ -4,6 +4,8 @@ id: "data_release"
 title: Data Release
 type: object
 namespace: http://gdc.nci.nih.gov
+program: '*'
+project: '*'
 category: internal
 description: >
   Internal node to store different data releases.

diff --git a/dictionaryutils/schemas/root.yaml b/dictionaryutils/schemas/root.yaml
@@ -4,6 +4,7 @@ id: "root"
 title: Root
 type: object
 program: '*'
+project: '*'
 root: '*'
 category: internal
 additionalProperties: false
@@ -15,6 +16,7 @@ systemProperties:
 
 uniqueKeys:
   - [id]
+links: []
 
 constraints: null