Suppress warnings about deprecated rcParams in matplotlib>=3.0 (#3013)

holoviz · Oct 25, 2018 · 2b3de81 · 2b3de81
1 parent 264c831
commit 2b3de81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/holoviews/plotting/mpl/plot.py b/holoviews/plotting/mpl/plot.py
@@ -17,15 +17,17 @@
 from ..plot import (DimensionedPlot, GenericLayoutPlot, GenericCompositePlot,
                     GenericElementPlot)
 from ..util import attach_streams, collate, displayable
-from .util import compute_ratios, fix_aspect
+from .util import compute_ratios, fix_aspect, mpl_version
 
 
 @contextmanager
 def _rc_context(rcparams):
     """
     Context manager that temporarily overrides the pyplot rcParams.
     """
-    old_rcparams = mpl.rcParams.copy()
+    deprecated = ['text.latex.unicode', 'examples.directory']
+    old_rcparams = {k: mpl.rcParams[k] for k in mpl.rcParams.keys()
+                    if mpl_version < '3.0' or k not in deprecated}
     mpl.rcParams.update(rcparams)
     try:
         yield

diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
@@ -1,10 +1,14 @@
 import re
 import warnings
+from distutils.version import LooseVersion
 
 import numpy as np
+import matplotlib
 from matplotlib import ticker
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 
+mpl_version = LooseVersion(matplotlib.__version__)  # noqa
+
 from ...core.util import basestring, _getargspec
 from ...element import Raster, RGB