Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import os.path
import sys
import json
import validictory
import jsonschema
import audit

if sys.version_info < (3,):
Expand Down Expand Up @@ -76,8 +76,8 @@ def validate(stream):

def valid_schema(obj):
try:
validictory.validate(obj, schema)
except validictory.validator.RequiredFieldValidationError:
jsonschema.validate(obj, schema)
except jsonschema.exceptions.ValidationError:
print("Failure to validate {id}".format(**obj))
raise

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
validictory
jsonschema
boto
9 changes: 5 additions & 4 deletions schema/license.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
}
}
},
"required": true,
"type": "array"
},
"keywords": {
Expand All @@ -37,7 +36,6 @@
},
"type": "object"
},
"required": true,
"type": "array"
},
"name": {
Expand All @@ -58,11 +56,9 @@
},
"type": "object"
},
"required": true,
"type": "array"
},
"superseded_by": {
"required": false,
"type": [
"null",
"string"
Expand All @@ -86,5 +82,10 @@
"type": "array"
}
},
"required": [
"identifiers",
"links",
"other_names"
],
"type": "object"
}