Use matplotlib-inline instead of ipykernel.pylab

IPython/core/display.py

@@ -371,7 +371,7 @@ def reload(self):
                     with gzip.open(BytesIO(data), 'rt', encoding=encoding) as fp:
                         encoding = None
                         data = fp.read()
-                    
+
             # decode data, if an encoding was specified
             # We only touch self.data once since
             # subclasses such as SVG have @data.setter methods
@@ -1155,7 +1155,10 @@ def reload(self):
 
 @skip_doctest
 def set_matplotlib_formats(*formats, **kwargs):
-    """Select figure formats for the inline backend. Optionally pass quality for JPEG.
+    """
+    DEPRECATED
+
+    Select figure formats for the inline backend. Optionally pass quality for JPEG.
 
     For example, this enables PNG and JPEG output with a JPEG quality of 90%::
 
@@ -1173,20 +1176,19 @@ def set_matplotlib_formats(*formats, **kwargs):
     **kwargs
         Keyword args will be relayed to ``figure.canvas.print_figure``.
     """
-    from IPython.core.interactiveshell import InteractiveShell
-    from IPython.core.pylabtools import select_figure_formats
-    # build kwargs, starting with InlineBackend config
-    kw = {}
-    from ipykernel.pylab.config import InlineBackend
-    cfg = InlineBackend.instance()
-    kw.update(cfg.print_figure_kwargs)
-    kw.update(**kwargs)
-    shell = InteractiveShell.instance()
-    select_figure_formats(shell, formats, **kw)
+    warnings.warn("`set_matplotlib_formats` is deprecated, directly use "
+                  "`matplotlib_inline.backend_inline.set_matplotlib_formats()`",
+                  DeprecationWarning, stacklevel=2)
+
+    from matplotlib_inline.backend_inline import set_matplotlib_formats as set_matplotlib_formats_orig
+    set_matplotlib_formats_orig(*formats, **kwargs)
 
 @skip_doctest
 def set_matplotlib_close(close=True):
-    """Set whether the inline backend closes all figures automatically or not.
+    """
+    DEPRECATED
+
+    Set whether the inline backend closes all figures automatically or not.
 
     By default, the inline backend used in the IPython Notebook will close all
     matplotlib figures automatically after each cell is run. This means that
@@ -1206,6 +1208,9 @@ def set_matplotlib_close(close=True):
         Should all matplotlib figures be automatically closed after each cell is
         run?
     """
-    from ipykernel.pylab.config import InlineBackend
-    cfg = InlineBackend.instance()
-    cfg.close_figures = close
+    warnings.warn("`set_matplotlib_close` is deprecated, directly use "
+                  "`matplotlib_inline.backend_inline.set_matplotlib_close()`",
+                  DeprecationWarning, stacklevel=2)
+
+    from matplotlib_inline.backend_inline import set_matplotlib_close as set_matplotlib_close_orig
+    set_matplotlib_close_orig(close)

IPython/core/pylabtools.py

@@ -25,7 +25,7 @@
             'svg': 'svg',
             'pdf': 'pdf',
             'ps': 'ps',
-            'inline': 'module://ipykernel.pylab.backend_inline',
+            'inline': 'module://matplotlib_inline.backend_inline',
             'ipympl': 'module://ipympl.backend_nbagg',
             'widget': 'module://ipympl.backend_nbagg',
             }
@@ -49,7 +49,7 @@
 del backend2gui['svg']
 del backend2gui['pdf']
 del backend2gui['ps']
-del backend2gui['module://ipykernel.pylab.backend_inline']
+del backend2gui['module://matplotlib_inline.backend_inline']
 
 #-----------------------------------------------------------------------------
 # Matplotlib utilities
@@ -274,7 +274,7 @@ def find_gui_and_backend(gui=None, gui_select=None):
     Returns
     -------
     A tuple of (gui, backend) where backend is one of ('TkAgg','GTKAgg',
-    'WXAgg','Qt4Agg','module://ipykernel.pylab.backend_inline','agg').
+    'WXAgg','Qt4Agg','module://matplotlib_inline.backend_inline','agg').
     """
 
     import matplotlib

IPython/core/tests/test_display.py

@@ -135,7 +135,7 @@ def test_image_filename_defaults():
     nt.assert_is_none(img._repr_jpeg_())
 
 def _get_inline_config():
-    from ipykernel.pylab.config import InlineBackend
+    from matplotlib_inline.config import InlineBackend
     return InlineBackend.instance()
 
 

setup.py

@@ -200,6 +200,7 @@
     'pygments',
     'backcall',
     'stack_data',
+    'matplotlib-inline',
 ]
 
 # Platform-specific dependencies: