Merge pull request #202 from marl/jsonschema3

Support jsonschema>=3.0
marl · Aug 13, 2019 · 9088b87 · 9088b87
2 parents ebdfd77 + a9857eb
commit 9088b87
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/jams/core.py b/jams/core.py
@@ -581,7 +581,7 @@ def validate(self, strict=True):
         valid = True
 
         try:
-            jsonschema.validate(self.__json__, self.__schema__)
+            schema.VALIDATOR.validate(self.__json__, self.__schema__)
 
         except jsonschema.ValidationError as invalid:
             if strict:
@@ -766,12 +766,12 @@ def validate(self, strict=True):
         valid = True
 
         try:
-            jsonschema.validate(self.__json_light__(data=False),
-                                schema.JAMS_SCHEMA)
+            schema.VALIDATOR.validate(self.__json_light__(data=False),
+                                                schema.JAMS_SCHEMA)
 
             # validate each record in the frame
             data_ser = [serialize_obj(obs) for obs in self.data]
-            jsonschema.validate(data_ser, ann_schema)
+            schema.VALIDATOR.validate(data_ser, ann_schema)
 
         except jsonschema.ValidationError as invalid:
             if strict:
@@ -1805,7 +1805,7 @@ def validate(self, strict=True):
         '''
         valid = True
         try:
-            jsonschema.validate(self.__json_light__, schema.JAMS_SCHEMA)
+            schema.VALIDATOR.validate(self.__json_light__, schema.JAMS_SCHEMA)
 
             for ann in self.annotations:
                 if isinstance(ann, Annotation):

diff --git a/jams/schema.py b/jams/schema.py
@@ -24,10 +24,11 @@
 from pkg_resources import resource_filename
 
 import numpy as np
+import jsonschema
 
 from .exceptions import NamespaceError, JamsError
 
-__all__ = ['add_namespace', 'namespace', 'is_dense', 'values', 'get_dtypes']
+__all__ = ['add_namespace', 'namespace', 'is_dense', 'values', 'get_dtypes', 'VALIDATOR']
 
 __NAMESPACE__ = dict()
 
@@ -248,3 +249,4 @@ def __load_jams_schema():
 NS_SCHEMA_DIR = os.path.join(SCHEMA_DIR, 'namespaces')
 
 JAMS_SCHEMA = __load_jams_schema()
+VALIDATOR = jsonschema.Draft4Validator(JAMS_SCHEMA)
diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@
     install_requires=[
         'pandas',
         'sortedcontainers>=2.0.0',
-        'jsonschema==2.6',
+        'jsonschema>=3.0.0',
         'numpy>=1.8.0',
         'six',
         'decorator',