Merge pull request #71 from minrk/nbconvert

s/jupyter_nbconvert/nbconvert/

jupyter_notebook/nbconvert/handlers.py

@@ -57,7 +57,7 @@ def get_exporter(format, **kwargs):
     """get an exporter, raising appropriate errors"""
     # if this fails, will raise 500
     try:
-        from jupyter_nbconvert.exporters.export import exporter_map
+        from nbconvert.exporters.export import exporter_map
     except ImportError as e:
         raise web.HTTPError(500, "Could not import nbconvert: %s" % e)
     

jupyter_notebook/services/contents/filemanager.py

@@ -34,7 +34,7 @@ def _post_save_script(model, os_path, contents_manager, **kwargs):
 
     replaces `ipython notebook --script`
     """
-    from jupyter_nbconvert.exporters.script import ScriptExporter
+    from nbconvert.exporters.script import ScriptExporter
 
     if model['type'] != 'notebook':
         return

jupyter_notebook/services/nbconvert/handlers.py

@@ -11,7 +11,7 @@ class NbconvertRootHandler(IPythonHandler):
     @json_errors
     def get(self):
         try:
-            from jupyter_nbconvert.exporters.export import exporter_map
+            from nbconvert.exporters.export import exporter_map
         except ImportError as e:
             raise web.HTTPError(500, "Could not import nbconvert: %s" % e)
         res = {}

requirements.txt

@@ -4,4 +4,4 @@
 -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/ipython_kernel.git#egg=ipython_kernel
--e git+https://github.com/jupyter/jupyter_nbconvert.git#egg=jupyter_nbconvert
+-e git+https://github.com/jupyter/nbconvert.git#egg=nbconvert

setup.py

@@ -147,7 +147,7 @@ install_requires = [
     'jupyter_core',
     'jupyter_client',
     'jupyter_nbformat',
-    'jupyter_nbconvert',
+    'nbconvert',
     'ipython_kernel', # bless IPython kernel for now
 ]
 extras_require = {