Use Draft4 JSON Schema for v4

IPython/nbformat/v4/nbbase.py

@@ -19,7 +19,7 b' from IPython.utils.py3compat import cast_unicode, unicode_type'
 # Change this when incrementing the nbformat version
 nbformat = 4
 nbformat_minor = 0
-nbformat_schema = 'v4.withref.json'
+nbformat_schema = 'nbformat.v4.schema.json'
 
 class NotebookNode(Struct):
     pass

IPython/nbformat/v4/nbformat.v4.schema.json

@@ -141,8 +141,7 b''
                 "level": {
                     "description": "Level of heading cells.",
                     "type": "integer",
-                    "minimum": 1,
-                    "maximum": 6
+                    "minimum": 1
                 }
             }
         },

IPython/nbformat/v4/tests/test_validate.py

@@ -8,119 +8,123 b' import os'
 
 import nose.tools as nt
 
-from ..validator import isvalid, validate, ValidationError
+from IPython.nbformat.validator import validate, ValidationError
 from ..nbjson import reads
+from ..nbbase import nbformat
 from ..compose import (
     new_code_cell, new_heading_cell, new_markdown_cell, new_notebook,
     new_output, new_raw_cell,
 )
 
+def validate4(obj, ref=None):
+    return validate(obj, ref, version=nbformat)
+
 def test_valid_code_cell():
     cell = new_code_cell()
-    validate(cell, 'code_cell')
+    validate4(cell, 'code_cell')
 
 def test_invalid_code_cell():
     cell = new_code_cell()
 
     cell['source'] = 5
     with nt.assert_raises(ValidationError):
-        validate(cell, 'code_cell')
+        validate4(cell, 'code_cell')
 
     cell = new_code_cell()
     del cell['metadata']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'code_cell')
+        validate4(cell, 'code_cell')
 
     cell = new_code_cell()
     del cell['source']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'code_cell')
+        validate4(cell, 'code_cell')
 
     cell = new_code_cell()
     del cell['cell_type']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'code_cell')
+        validate4(cell, 'code_cell')
 
 def test_invalid_markdown_cell():
     cell = new_markdown_cell()
 
     cell['source'] = 5
     with nt.assert_raises(ValidationError):
-        validate(cell, 'markdown_cell')
+        validate4(cell, 'markdown_cell')
 
     cell = new_markdown_cell()
     del cell['metadata']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'markdown_cell')
+        validate4(cell, 'markdown_cell')
 
     cell = new_markdown_cell()
     del cell['source']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'markdown_cell')
+        validate4(cell, 'markdown_cell')
 
     cell = new_markdown_cell()
     del cell['cell_type']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'markdown_cell')
+        validate4(cell, 'markdown_cell')
 
 def test_invalid_heading_cell():
     cell = new_heading_cell()
 
     cell['source'] = 5
     with nt.assert_raises(ValidationError):
-        validate(cell, 'heading_cell')
+        validate4(cell, 'heading_cell')
 
     cell = new_heading_cell()
     del cell['metadata']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'heading_cell')
+        validate4(cell, 'heading_cell')
 
     cell = new_heading_cell()
     del cell['source']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'heading_cell')
+        validate4(cell, 'heading_cell')
 
     cell = new_heading_cell()
     del cell['cell_type']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'heading_cell')
+        validate4(cell, 'heading_cell')
 
 def test_invalid_raw_cell():
     cell = new_raw_cell()
 
     cell['source'] = 5
     with nt.assert_raises(ValidationError):
-        validate(cell, 'raw_cell')
+        validate4(cell, 'raw_cell')
 
     cell = new_raw_cell()
     del cell['metadata']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'raw_cell')
+        validate4(cell, 'raw_cell')
 
     cell = new_raw_cell()
     del cell['source']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'raw_cell')
+        validate4(cell, 'raw_cell')
 
     cell = new_raw_cell()
     del cell['cell_type']
 
     with nt.assert_raises(ValidationError):
-        validate(cell, 'raw_cell')
+        validate4(cell, 'raw_cell')
 
 def test_sample_notebook():
     here = os.path.dirname(__file__)
     with io.open(os.path.join(here, "v4-test.ipynb"), encoding='utf-8') as f:
         nb = reads(f.read())
-    validate(nb)
+    validate4(nb)

setupbase.py

@@ -199,6 +199,7 b' def find_package_data():'
         'IPython.nbformat' : [
             'tests/*.ipynb',
             'v3/nbformat.v3.schema.json',
+            'v4/nbformat.v4.schema.json',
             ]
     }