replace jupyter_nbformat by nbformat

Also replace the `import nbformat as nbformat` by `import nbformat`
and change the name of the installed egg.

jupyter_notebook/nbconvert/handlers.py

@@ -13,7 +13,7 @@ from ..base.handlers import (
     IPythonHandler, FilesRedirectHandler,
     path_regex,
 )
-from jupyter_nbformat import from_dict
+from nbformat import from_dict
 
 from ipython_genutils.py3compat import cast_bytes
 from ipython_genutils import text

jupyter_notebook/nbconvert/tests/test_nbconvert_handlers.py

@@ -10,8 +10,8 @@ import requests
 
 from jupyter_notebook.utils import url_path_join
 from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
-from jupyter_nbformat import write
-from jupyter_nbformat.v4 import (
+from nbformat import write
+from nbformat.v4 import (
     new_notebook, new_markdown_cell, new_code_cell, new_output,
 )
 

jupyter_notebook/notebookapp.py

@@ -74,7 +74,7 @@ from jupyter_core.application import (
 from jupyter_client import KernelManager
 from jupyter_client.kernelspec import KernelSpecManager, NoSuchKernel, NATIVE_KERNEL_NAME
 from jupyter_client.session import Session
-from jupyter_nbformat.sign import NotebookNotary
+from nbformat.sign import NotebookNotary
 from . import submodule
 from traitlets import (
     Dict, Unicode, Integer, List, Bool, Bytes, Instance,

jupyter_notebook/services/contents/fileio.py

@@ -18,7 +18,7 @@ from jupyter_notebook.utils import (
     to_api_path,
     to_os_path,
 )
-import jupyter_nbformat as nbformat
+import nbformat
 
 from ipython_genutils.py3compat import str_to_unicode
 

jupyter_notebook/services/contents/filemanager.py

@@ -8,7 +8,7 @@ import io
 import os
 import shutil
 import mimetypes
-import jupyter_nbformat as nbformat
+import nbformat
 
 from tornado import web
 

jupyter_notebook/services/contents/manager.py

@@ -13,8 +13,8 @@ from tornado.web import HTTPError
 
 from .checkpoints import Checkpoints
 from traitlets.config.configurable import LoggingConfigurable
-from jupyter_nbformat import sign, validate, ValidationError
-from jupyter_nbformat.v4 import new_notebook
+from nbformat import sign, validate, ValidationError
+from nbformat.v4 import new_notebook
 from ipython_genutils.importstring import import_item
 from traitlets import (
     Any,

jupyter_notebook/services/contents/tests/test_contents_api.py

@@ -18,11 +18,11 @@ from ..filecheckpoints import GenericFileCheckpoints
 from traitlets.config import Config
 from jupyter_notebook.utils import url_path_join, url_escape, to_os_path
 from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
-from jupyter_nbformat import read, write, from_dict
-from jupyter_nbformat.v4 import (
+from nbformat import read, write, from_dict
+from nbformat.v4 import (
     new_notebook, new_markdown_cell,
 )
-from jupyter_nbformat import v2
+from nbformat import v2
 from ipython_genutils import py3compat
 from ipython_genutils.tempdir import TemporaryDirectory
 

jupyter_notebook/services/contents/tests/test_manager.py

@@ -12,7 +12,7 @@ from tornado.web import HTTPError
 from unittest import TestCase
 from tempfile import NamedTemporaryFile
 
-from jupyter_nbformat import v4 as nbformat
+from nbformat import v4 as nbformat
 
 from ipython_genutils.tempdir import TemporaryDirectory
 from traitlets import TraitError

jupyter_notebook/services/sessions/tests/test_sessions_api.py

@@ -12,8 +12,8 @@ pjoin = os.path.join
 
 from jupyter_notebook.utils import url_path_join
 from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
-from jupyter_nbformat.v4 import new_notebook
-from jupyter_nbformat import write
+from nbformat.v4 import new_notebook
+from nbformat import write
 
 class SessionAPI(object):
     """Wrapper for notebook API calls."""

jupyter_notebook/tests/test_files.py

@@ -10,8 +10,8 @@ pjoin = os.path.join
 import requests
 import json
 
-from jupyter_nbformat import write
-from jupyter_nbformat.v4 import (new_notebook,
+from nbformat import write
+from nbformat.v4 import (new_notebook,
                               new_markdown_cell, new_code_cell,
                               new_output)
 

jupyter_notebook/tree/tests/test_tree_handler.py

@@ -2,8 +2,8 @@
 import os
 import io
 from jupyter_notebook.utils import url_path_join
-from jupyter_nbformat import write
-from jupyter_nbformat.v4 import new_notebook
+from nbformat import write
+from nbformat.v4 import new_notebook
 
 import requests
 

requirements.txt

@@ -1,6 +1,6 @@
 -e git+https://github.com/ipython/traitlets.git#egg=traitlets
 -e git+https://github.com/jupyter/jupyter_core.git#egg=jupyter_core
--e git+https://github.com/jupyter/jupyter_nbformat.git#egg=jupyter_nbformat
+-e git+https://github.com/jupyter/nbformat.git#egg=nbformat
 -e git+https://github.com/jupyter/jupyter_client.git#egg=jupyter_client
 -e git+https://github.com/ipython/ipython.git#egg=ipython
 -e git+https://github.com/ipython/ipykernel.git#egg=ipykernel

setup.py

@@ -146,7 +146,7 @@ install_requires = [
     'traitlets',
     'jupyter_core',
     'jupyter_client',
-    'jupyter_nbformat',
+    'nbformat',
     'nbconvert',
     'ipykernel', # bless IPython kernel for now
 ]