shadidsh · shadidsh · Feb 20, 2018 · Mar 1, 2018 · Mar 7, 2018 · Mar 7, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -115,7 +115,7 @@ before_install:
       # We could install ghostscript and inkscape here to test svg and pdf
       # but this makes the test time really long.
       # brew install ghostscript inkscape
-      export PATH=/usr/local/opt/ccache/libexec:$PATH
+      export PATH=/usr/local/opt/python/libexec/bin:/usr/local/opt/ccache/libexec:$PATH
     fi
 
 install:
@@ -153,7 +153,7 @@ install:
       python -c 'import PyQt5.QtCore' &&
       echo 'PyQt5 is available' ||
       echo 'PyQt5 is not available'
-    python -mpip install -U --pre \
+    python -mpip install -U \
       --no-index -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 \
       wxPython &&
       python -c 'import wx' &&

diff --git a/doc/api/next_api_changes/2018-03-14-SS.rst b/doc/api/next_api_changes/2018-03-14-SS.rst
@@ -0,0 +1,5 @@
+``AutoDateLocator.get_locator`` now contains reduced datetime overlaps
+````````````````````````````````````````````````````````````````````````
+
+Due to issue #7712, the interval frequency of datetime ticks gets reduced in order
+to avoid overlapping tick labels.
diff --git a/doc/conf.py b/doc/conf.py
@@ -153,7 +153,7 @@ def _check_deps():
 project = 'Matplotlib'
 copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
              'Michael Droettboom and the Matplotlib development '
-             'team; 2012 - 2017 The Matplotlib development team')
+             'team; 2012 - 2018 The Matplotlib development team')
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.

diff --git a/doc/sphinxext/mock_gui_toolkits.py b/doc/sphinxext/mock_gui_toolkits.py
@@ -118,15 +118,12 @@ class ToolBar(object):
     class Frame(object):
         pass
 
-    VERSION_STRING = '2.9'
-
 
 def setup(app):
-    sys.modules['cairocffi'] = MyCairoCffi()
-    sys.modules['PyQt4'] = MyPyQt4()
-    sys.modules['sip'] = MySip()
-    sys.modules['wx'] = MyWX()
-    sys.modules['wxversion'] = MagicMock()
-
-    metadata = {'parallel_read_safe': True, 'parallel_write_safe': True}
-    return metadata
+    sys.modules.update(
+        cairocffi=MyCairoCffi(),
+        PyQt4=MyPyQt4(),
+        sip=MySip(),
+        wx=MyWX(),
+    )
+    return {'parallel_read_safe': True, 'parallel_write_safe': True}
diff --git a/doc/users/next_whats_new/markevery_prop_cycle.rst b/doc/users/next_whats_new/markevery_prop_cycle.rst
@@ -0,0 +1,7 @@
+Implemented support for axes.prop_cycle property markevery in rcParams
+----------------------------------------------------------------------
+
+The Matplotlib ``rcParams`` settings object now supports configuration
+of the attribute `axes.prop_cycle` with cyclers using the `markevery`
+Line2D object property. An example of this feature is provided at 
+`~matplotlib/examples/lines_bars_and_markers/markevery_prop_cycle.py`
diff --git a/examples/lines_bars_and_markers/markevery_prop_cycle.py b/examples/lines_bars_and_markers/markevery_prop_cycle.py
@@ -0,0 +1,67 @@
+"""
+=================================================================
+Implemented support for prop_cycle property markevery in rcParams
+=================================================================
+
+This example demonstrates a working solution to issue #8576, providing full
+support of the markevery property for axes.prop_cycle assignments through
+rcParams. Makes use of the same list of markevery cases from
+https://matplotlib.org/examples/pylab_examples/markevery_demo.html
+
+Renders a plot with shifted-sine curves along each column with
+a unique markevery value for each sine curve.
+"""
+from cycler import cycler
+import numpy as np
+import matplotlib as mpl
+import matplotlib.pyplot as plt
+
+# Define a list of markevery cases and color cases to plot
+cases = [None,
+         8,
+         (30, 8),
+         [16, 24, 30],
+         [0, -1],
+         slice(100, 200, 3),
+         0.1,
+         0.3,
+         1.5,
+         (0.0, 0.1),
+         (0.45, 0.1)]
+
+colors = ['#1f77b4',
+          '#ff7f0e',
+          '#2ca02c',
+          '#d62728',
+          '#9467bd',
+          '#8c564b',
+          '#e377c2',
+          '#7f7f7f',
+          '#bcbd22',
+          '#17becf',
+          '#1a55FF']
+
+# Create two different cyclers to use with axes.prop_cycle
+markevery_cycler = cycler(markevery=cases)
+color_cycler = cycler('color', colors)
+
+# Configure rcParams axes.prop_cycle with custom cycler
+custom_cycler = color_cycler + markevery_cycler
+mpl.rcParams['axes.prop_cycle'] = custom_cycler
+
+# Create data points and offsets
+x = np.linspace(0, 2 * np.pi)
+offsets = np.linspace(0, 2 * np.pi, 11, endpoint=False)
+yy = np.transpose([np.sin(x + phi) for phi in offsets])
+
+# Set the plot curve with markers and a title
+fig = plt.figure()
+ax = fig.add_axes([0.1, 0.1, 0.6, 0.75])
+
+for i in range(len(cases)):
+    ax.plot(yy[:, i], marker='o', label=str(cases[i]))
+    ax.legend(bbox_to_anchor=(1.05, 1), loc=2, borderaxespad=0.)
+
+plt.title('Support for axes.prop_cycle cycler with markevery')
+
+plt.show()
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -233,6 +233,7 @@ def _is_writable_dir(p):
     return os.access(p, os.W_OK) and os.path.isdir(p)
 
 _verbose_msg = """\
+matplotlib.verbose is deprecated;
 Command line argument --verbose-LEVEL is deprecated.
 This functionality is now provided by the standard
 python logging library.  To get more (or less) logging output:
@@ -297,7 +298,6 @@ def _parse_commandline():
 _parse_commandline()
 
 
-@cbook.deprecated("2.2", message=_verbose_msg)
 class Verbose(object):
     """
     A class to handle reporting.  Set the fileo attribute to any file
@@ -320,10 +320,12 @@ class Verbose(object):
         if level_str in levels:
             _commandLineVerbose = level_str
 
+    @cbook.deprecated("2.2", message=_verbose_msg)
     def __init__(self):
         self.set_level('silent')
         self.fileo = sys.stdout
 
+    @cbook.deprecated("2.2", message=_verbose_msg)
     def set_level(self, level):
         'set the verbosity to one of the Verbose.levels strings'
 
@@ -335,6 +337,7 @@ def set_level(self, level):
         else:
             self.level = level
 
+    @cbook.deprecated("2.2", message=_verbose_msg)
     def set_fileo(self, fname):
         std = {
             'sys.stdout': sys.stdout,
@@ -352,6 +355,7 @@ def set_fileo(self, fname):
             else:
                 self.fileo = fileo
 
+    @cbook.deprecated("2.2", message=_verbose_msg)
     def report(self, s, level='helpful'):
         """
         print message s to self.fileo if self.level>=level.  Return
@@ -363,6 +367,7 @@ def report(self, s, level='helpful'):
             return True
         return False
 
+    @cbook.deprecated("2.2", message=_verbose_msg)
     def wrap(self, fmt, func, level='helpful', always=True):
         """
         return a callable function that wraps func and reports it
@@ -386,6 +391,7 @@ def wrapper(*args, **kwargs):
         wrapper.__doc__ = func.__doc__
         return wrapper
 
+    @cbook.deprecated("2.2", message=_verbose_msg)
     def ge(self, level):
         'return true if self.level is >= level'
         return self.vald[self.level] >= self.vald[level]

diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -667,8 +667,9 @@ def _args(self):
                 '-s', '%dx%d' % self.frame_size, '-pix_fmt', self.frame_format,
                 '-r', str(self.fps)]
         # Logging is quieted because subprocess.PIPE has limited buffer size.
-
-        if (_log.getEffectiveLevel() < logging.DEBUG):
+        # If you have a lot of frames in your animation and set logging to
+        # DEBUG, you will have a buffer overrun.
+        if (_log.getEffectiveLevel() > logging.DEBUG):
             args += ['-loglevel', 'quiet']
         args += ['-i', 'pipe:'] + self.output_args
         return args

diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1568,6 +1568,9 @@ def set_major_formatter(self, formatter):
 
         ACCEPTS: A :class:`~matplotlib.ticker.Formatter` instance
         """
+        if not isinstance(formatter, mticker.Formatter):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Formatter")
         self.isDefault_majfmt = False
         self.major.formatter = formatter
         formatter.set_axis(self)
@@ -1579,6 +1582,9 @@ def set_minor_formatter(self, formatter):
 
         ACCEPTS: A :class:`~matplotlib.ticker.Formatter` instance
         """
+        if not isinstance(formatter, mticker.Formatter):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Formatter")
         self.isDefault_minfmt = False
         self.minor.formatter = formatter
         formatter.set_axis(self)
@@ -1590,6 +1596,9 @@ def set_major_locator(self, locator):
 
         ACCEPTS: a :class:`~matplotlib.ticker.Locator` instance
         """
+        if not isinstance(locator, mticker.Locator):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Locator")
         self.isDefault_majloc = False
         self.major.locator = locator
         locator.set_axis(self)
@@ -1601,6 +1610,9 @@ def set_minor_locator(self, locator):
 
         ACCEPTS: a :class:`~matplotlib.ticker.Locator` instance
         """
+        if not isinstance(locator, mticker.Locator):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Locator")
         self.isDefault_minloc = False
         self.minor.locator = locator
         locator.set_axis(self)

diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2130,6 +2130,8 @@ def print_figure(self, filename, dpi=None, facecolor=None, edgecolor=None,
 
         if format is None:
             # get format from filename, or from backend's default filetype
+            if isinstance(filename, getattr(os, "PathLike", ())):
+                filename = os.fspath(filename)
             if isinstance(filename, six.string_types):
                 format = os.path.splitext(filename)[1][1:]
             if format is None or format == '':

diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -336,11 +336,10 @@ def button_press_event(self, event, dblclick=False):
         y = self.figure.bbox.height - event.y
         num = getattr(event, 'num', None)
 
-        if sys.platform=='darwin':
-            # 2 and 3 were reversed on the OSX platform I
-            # tested under tkagg
-            if   num==2: num=3
-            elif num==3: num=2
+        if sys.platform == 'darwin':
+            # 2 and 3 were reversed on the OSX platform I tested under tkagg.
+            if num == 2: num = 3
+            elif num == 3: num = 2
 
         FigureCanvasBase.button_press_event(self, x, y, num, dblclick=dblclick, guiEvent=event)
 
@@ -354,11 +353,10 @@ def button_release_event(self, event):
 
         num = getattr(event, 'num', None)
 
-        if sys.platform=='darwin':
-            # 2 and 3 were reversed on the OSX platform I
-            # tested under tkagg
-            if   num==2: num=3
-            elif num==3: num=2
+        if sys.platform == 'darwin':
+            # 2 and 3 were reversed on the OSX platform I tested under tkagg.
+            if num == 2: num = 3
+            elif num == 3: num = 2
 
         FigureCanvasBase.button_release_event(self, x, y, num, guiEvent=event)
 
@@ -387,8 +385,8 @@ def _get_key(self, event):
         val = event.keysym_num
         if val in self.keyvald:
             key = self.keyvald[val]
-        elif val == 0 and sys.platform == 'darwin' and \
-                                        event.keycode in self._keycode_lookup:
+        elif (val == 0 and sys.platform == 'darwin'
+              and event.keycode in self._keycode_lookup):
             key = self._keycode_lookup[event.keycode]
         elif val < 256:
             key = chr(val)

diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -30,7 +30,7 @@
 
 # create a list of system fonts, all of these should work with xe/lua-latex
 system_fonts = []
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
     from matplotlib import font_manager
     for f in font_manager.win32InstalledFonts():
         try:

diff --git a/lib/matplotlib/backends/wx_compat.py b/lib/matplotlib/backends/wx_compat.py
@@ -11,27 +11,12 @@
                         unicode_literals)
 
 import six
-from distutils.version import StrictVersion, LooseVersion
 
-missingwx = "Matplotlib backend_wx and backend_wxagg require wxPython>=2.9"
+import wx
+backend_version = wx.VERSION_STRING
+is_phoenix = 'phoenix' in wx.PlatformInfo
 
 
-try:
-    import wx
-    backend_version = wx.VERSION_STRING
-    is_phoenix = 'phoenix' in wx.PlatformInfo
-except ImportError:
-    raise ImportError(missingwx)
-
-try:
-    wx_version = StrictVersion(wx.VERSION_STRING)
-except ValueError:
-    wx_version = LooseVersion(wx.VERSION_STRING)
-
-# Ensure we have the correct version imported
-if wx_version < str("2.9"):
-    raise ImportError(missingwx)
-
 if is_phoenix:
     # define all the wxPython phoenix stuff
 
@@ -157,22 +142,11 @@ def _AddTool(parent, wx_ids, text, bmp, tooltip_text):
     else:
         add_tool = parent.DoAddTool
 
-    if not is_phoenix or wx_version >= str("4.0.0b2"):
-        # NOTE: when support for Phoenix prior to 4.0.0b2 is dropped then
-        # all that is needed is this clause, and the if and else clause can
-        # be removed.
-        kwargs = dict(label=text,
-                      bitmap=bmp,
-                      bmpDisabled=wx.NullBitmap,
-                      shortHelp=text,
-                      longHelp=tooltip_text,
-                      kind=kind)
-    else:
-        kwargs = dict(label=text,
-                      bitmap=bmp,
-                      bmpDisabled=wx.NullBitmap,
-                      shortHelpString=text,
-                      longHelpString=tooltip_text,
-                      kind=kind)
+    kwargs = dict(label=text,
+                  bitmap=bmp,
+                  bmpDisabled=wx.NullBitmap,
+                  shortHelp=text,
+                  longHelp=tooltip_text,
+                  kind=kind)
 
     return add_tool(wx_ids[text], **kwargs)