Merge pull request #2503 from jakevdp/jsonschema-update

Compatibility with jsonschema 4.0

altair/utils/schemapi.py

@@ -150,6 +150,7 @@ class SchemaBase(object):
     _schema = None
     _rootschema = None
     _class_is_valid_at_instantiation = True
+    _validator = jsonschema.Draft7Validator
 
     def __init__(self, *args, **kwds):
         # Two valid options for initialization, which should be handled by
@@ -439,7 +440,9 @@ def validate(cls, instance, schema=None):
         if schema is None:
             schema = cls._schema
         resolver = jsonschema.RefResolver.from_schema(cls._rootschema or cls._schema)
-        return jsonschema.validate(instance, schema, resolver=resolver)
+        return jsonschema.validate(
+            instance, schema, cls=cls._validator, resolver=resolver
+        )
 
     @classmethod
     def resolve_references(cls, schema=None):

requirements.txt

@@ -1,6 +1,6 @@
 entrypoints
 jinja2
-jsonschema<4.0
+jsonschema>=3.0,<4.0
 numpy
 pandas>=0.18
 toolz

tools/schemapi/schemapi.py

@@ -148,6 +148,7 @@ class SchemaBase(object):
     _schema = None
     _rootschema = None
     _class_is_valid_at_instantiation = True
+    _validator = jsonschema.Draft7Validator
 
     def __init__(self, *args, **kwds):
         # Two valid options for initialization, which should be handled by
@@ -437,7 +438,9 @@ def validate(cls, instance, schema=None):
         if schema is None:
             schema = cls._schema
         resolver = jsonschema.RefResolver.from_schema(cls._rootschema or cls._schema)
-        return jsonschema.validate(instance, schema, resolver=resolver)
+        return jsonschema.validate(
+            instance, schema, cls=cls._validator, resolver=resolver
+        )
 
     @classmethod
     def resolve_references(cls, schema=None):