enable reading v4 notebooks

- add v4 to reader
- validation is not backported
- update some tests to reflect this
- test opening v4 notebooks

IPython/nbformat/reader.py

@@ -21,11 +21,13 b' import json'
 from . import v1
 from . import v2
 from . import v3
+from . import v4
 
 versions = {
     1: v1,
     2: v2,
     3: v3,
+    4: v4,
     }
 
 #-----------------------------------------------------------------------------

IPython/nbformat/tests/test_current.py

@@ -1,31 +1,19 b''
 """
 Contains tests class for current.py
 """
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2013  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
 from .base import TestsBase
 
 from ..reader import get_version
 from ..current import read, current_nbformat
 
-#-----------------------------------------------------------------------------
-# Classes and functions
-#-----------------------------------------------------------------------------
-
 class TestCurrent(TestsBase):
 
-    def test_read(self):
-        """Can older notebooks be opened and automatically converted to the current 
-        nbformat?"""
+    def test_read_v2(self):
+        """Can v2 notebooks be opened into the current nbformat?"""
 
         # Open a version 2 notebook.
         with self.fopen(u'test2.ipynb', u'r') as f:
@@ -34,3 +22,14 b' class TestCurrent(TestsBase):'
         # Check that the notebook was upgraded to the latest version automatically.
         (major, minor) = get_version(nb)
         self.assertEqual(major, current_nbformat)
+
+    def test_read_v4(self):
+        """Can v4 notebooks be opened into the current nbformat?"""
+        
+        # open a v4 notebook
+        with self.fopen(u'test4.ipynb', u'r') as f:
+            nb = read(f, u'json')
+
+        # Check that the notebook was converted to current automatically.
+        (major, minor) = get_version(nb)
+        self.assertEqual(major, current_nbformat)

IPython/nbformat/v3/tests/nbexamples.py

@@ -13,12 +13,11 b' from ..nbbase import ('
 png = encodestring(os.urandom(5)).decode('ascii')
 jpeg = encodestring(os.urandom(6)).decode('ascii')
 
-ws = new_worksheet(name='worksheet1')
+ws = new_worksheet()
 
 ws.cells.append(new_text_cell(
     u'html',
     source='Some NumPy Examples',
-    rendered='Some NumPy Examples'
 ))
 
 
@@ -31,7 +30,6 b' ws.cells.append(new_code_cell('
 ws.cells.append(new_text_cell(
     u'markdown',
     source='A random array',
-    rendered='A random array'
 ))
 
 ws.cells.append(new_text_cell(
@@ -70,7 +68,7 b' ws.cells.append(new_code_cell('
         output_png=png,
         output_jpeg=jpeg,
         output_svg=u'<svg>',
-        output_json=u'json data',
+        output_json=u'{"json": "data"}',
         output_javascript=u'var i=0;',
         prompt_number=3
     ),new_output(
@@ -81,7 +79,7 b' ws.cells.append(new_code_cell('
         output_png=png,
         output_jpeg=jpeg,
         output_svg=u'<svg>',
-        output_json=u'json data',
+        output_json=u'{"json": "data"}',
         output_javascript=u'var i=0;'
     ),new_output(
         output_type=u'pyerr',
@@ -104,7 +102,7 b" md = new_metadata(name=u'My Notebook',license=u'BSD',created=u'8601_goes_here',"
     modified=u'8601_goes_here',gistid=u'21341231',authors=authors)
 
 nb0 = new_notebook(
-    worksheets=[ws, new_worksheet(name='worksheet2')],
+    worksheets=[ws, new_worksheet()],
     metadata=md
 )
 

IPython/nbformat/v4/convert.py

@@ -12,15 +12,10 b' from .nbbase import ('
 )
 
 from IPython.nbformat import v3
-from IPython.utils.log import get_logger
 
 def _warn_if_invalid(nb, version):
     """Log validation errors, if there are any."""
-    from IPython.nbformat import validate, ValidationError
-    try:
-        validate(nb, version=version)
-    except ValidationError as e:
-        get_logger().error("Notebook JSON is not valid v%i: %s", version, e)
+    return
 
 def upgrade(nb, from_version=3, from_minor=0):
     """Convert a notebook to v4.

IPython/nbformat/v4/nbbase.py

@@ -18,9 +18,8 b" nbformat_schema = 'nbformat.v4.schema.json'"
 
 
 def validate(node, ref=None):
-    """validate a v4 node"""
-    from .. import validate
-    return validate(node, ref=ref, version=nbformat)
+    """nbformat validation is not backported"""
+    return
 
 
 def new_output(output_type, data=None, **kwargs):

IPython/nbformat/v4/tests/test_convert.py

@@ -3,7 +3,7 b' import copy'
 
 import nose.tools as nt
 
-from IPython.nbformat import validate
+from ..nbbase import validate
 from .. import convert
 
 from . import nbexamples

IPython/nbformat/v4/tests/test_nbbase.py

@@ -3,7 +3,6 b''
 
 import nose.tools as nt
 
-from IPython.nbformat.validator import isvalid, validate, ValidationError
 from ..nbbase import (
     NotebookNode, nbformat,
     new_code_cell, new_markdown_cell, new_notebook,