jupyter_nbformat is now nbformat

IPython/core/interactiveshell.py

@@ -2689,7 +2689,7 b' class InteractiveShell(SingletonConfigurable):'
         def get_cells():
             """generator for sequence of code blocks to run"""
             if fname.endswith('.ipynb'):
-                from jupyter_nbformat import read
+                from nbformat import read
                 with io_open(fname) as f:
                     nb = read(f, as_version=4)
                     if not nb.cells:

IPython/core/magics/basic.py

@@ -596,7 +596,7 b' Defaulting color scheme to \'NoColor\'"""'
         """
         args = magic_arguments.parse_argstring(self.notebook, s)
 
-        from jupyter_nbformat import write, v4
+        from nbformat import write, v4
         args.filename = unquote_filename(args.filename)
         if args.export:
             cells = []

IPython/core/tests/test_magic.py

@@ -619,7 +619,7 b' def test_extension():'
         tmpdir.cleanup()
 
 
[e-mail]_without('jupyter_nbformat')
[e-mail]_without('nbformat')
 def test_notebook_export_json():
     _ip = get_ipython()
     _ip.history_manager.reset()   # Clear any existing history.

IPython/core/tests/test_run.py

@@ -375,10 +375,10 b' tclass.py: deleting object: C-third'
         with tt.AssertNotPrints('SystemExit'):
             _ip.magic('run -e %s' % self.fname)
 
-    @dec.skip_without('jupyter_nbformat')  # Requires jsonschema
+    @dec.skip_without('nbformat')  # Requires jsonschema
     def test_run_nb(self):
         """Test %run notebook.ipynb"""
-        from jupyter_nbformat import v4, writes
+        from nbformat import v4, writes
         nb = v4.new_notebook(
            cells=[
                 v4.new_markdown_cell("The Ultimate Question of Everything"),

IPython/nbformat.py

@@ -8,7 +8,7 b' import sys'
 from warnings import warn
 
 warn("The `IPython.nbformat` package has been deprecated. "
-     "You should import from jupyter_nbformat instead.")
+     "You should import from nbformat instead.")
 
 from IPython.utils.shimmodule import ShimModule
 
@@ -16,4 +16,4 b' from IPython.utils.shimmodule import ShimModule'
 # trigger the custom attribute access above
 
 sys.modules['IPython.nbformat'] = ShimModule(
-    src='IPython.nbformat', mirror='jupyter_nbformat')
+    src='IPython.nbformat', mirror='nbformat')

IPython/terminal/ipapp.py

@@ -231,7 +231,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
         nbconvert=('nbconvert.nbconvertapp.NbConvertApp',
             "DEPRECATED: Convert notebooks to/from other formats."
         ),
-        trust=('jupyter_nbformat.sign.TrustNotebookApp',
+        trust=('nbformat.sign.TrustNotebookApp',
             "DEPRECATED: Sign notebooks to trust their potentially unsafe contents at load."
         ),
         kernelspec=('jupyter_client.kernelspecapp.KernelSpecApp',

IPython/terminal/tests/test_help.py

@@ -25,6 +25,6 b' def test_locate_help():'
 def test_locate_profile_help():
     tt.help_all_output_test("locate profile")
 
-@skip_without('jupyter_nbformat')  # Requires jsonschema to be installed
+@skip_without('nbformat')  # Requires jsonschema to be installed
 def test_trust_help():
     tt.help_all_output_test("trust")

setup.py

@@ -207,7 +207,7 b' extras_require = dict('
     test = ['nose>=0.10.1', 'requests', 'testpath'],
     terminal = [],
     kernel = ['ipykernel'],
-    nbformat = ['jupyter_nbformat'],
+    nbformat = ['nbformat'],
     notebook = ['jupyter_notebook'],
     nbconvert = ['nbconvert'],
 )