proplot-dev · lukelbd · Sep 18, 2019 · Sep 18, 2019 · Sep 18, 2019 · Sep 29, 2019
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1,8 @@
+# Install shinx extensions
+# WARNING: Pip install hangs onto older commits unless __version__ is changed
+# since otherwise setup.py will not think it is necessary to rebuild
+pyyaml>=5.0.0
+numpy>=1.14
+ipython>=7.0.0
+matplotlib>=3.0
+git+https://github.com/lukelbd/[email protected]
diff --git a/proplot/__init__.py b/proplot/__init__.py
@@ -1,7 +1,13 @@
 #!/usr/bin/env python3
 # Import everything into the top-level module namespace
-# Make sure to load styletools early so we can try to update TTFPATH before
-# the fontManager is loaded by other modules (requiring a rebuild)
+# Monkey patch warnings format for warnings issued by ProPlot, make sure to
+# detect if this is just a matplotlib warning traced back to ProPlot code by
+# testing whether the warned line contains "warnings.warn"
+# See: https://stackoverflow.com/a/2187390/4970632
+# For internal warning call signature:
+# https://docs.python.org/3/library/warnings.html#warnings.showwarning
+# For default warning source code see:
+# https://github.com/python/cpython/blob/master/Lib/warnings.py
 import os as _os
 import pkg_resources as _pkg
 from .utils import _benchmark

diff --git a/proplot/axes.py b/proplot/axes.py
@@ -122,16 +122,13 @@ def _parse_format(mode=2, rc_kw=None, **kwargs):
 class Axes(maxes.Axes):
     """Lowest-level axes subclass. Handles titles and axis
     sharing. Adds several new methods and overrides existing ones."""
-    def __init__(self, *args, number=None, main=False, **kwargs):
+    def __init__(self, *args, number=None, **kwargs):
         """
         Parameters
         ----------
         number : int
             The subplot number, used for a-b-c labeling. See `~Axes.format`
             for details. Note the first axes is ``1``, not ``0``.
-        main : bool, optional
-            Used internally, indicates whether this is a "main axes" rather
-            than a twin, panel, or inset axes.
         *args, **kwargs
             Passed to `~matplotlib.axes.Axes`.
 
@@ -184,8 +181,6 @@ def __init__(self, *args, number=None, main=False, **kwargs):
             0.5, 0.95, '', va='bottom', ha='center', transform=coltransform)
         self._share_setup()
         self.number = number  # for abc numbering
-        if main:
-            self.figure._axes_main.append(self)
         self.format(mode=1)  # mode == 1 applies the rcShortParams
 
     def _draw_auto_legends_colorbars(self):
@@ -357,10 +352,10 @@ def _range_gridspec(self, x):
             raise RuntimeError(f'Axes is not a subplot.')
         ss = self.get_subplotspec()
         if x == 'x':
-            _, _, _, _, col1, col2 = ss.get_active_rows_columns()
+            _, _, _, _, col1, col2 = ss.get_rows_columns()
             return col1, col2
         else:
-            _, _, row1, row2, _, _ = ss.get_active_rows_columns()
+            _, _, row1, row2, _, _ = ss.get_rows_columns()
             return row1, row2
 
     def _range_tightbbox(self, x):
@@ -383,6 +378,7 @@ def _reassign_suplabel(self, side):
         # Place column and row labels on panels instead of axes -- works when
         # this is called on the main axes *or* on the relevant panel itself
         # TODO: Mixed figure panels with super labels? How does that work?
+        # TODO: Remove this when panels implemented as stacks!
         s = side[0]
         side = SIDE_TRANSLATE[s]
         if s == self._panel_side:
@@ -415,6 +411,7 @@ def _reassign_title(self):
         # called on the main axes *or* on the top panel itself. This is
         # critical for bounding box calcs; not always clear whether draw() and
         # get_tightbbox() are called on the main axes or panel first
+        # TODO: Remove this when panels implemented as stacks!
         if self._panel_side == 'top' and self._panel_parent:
             ax, taxs = self._panel_parent, [self]
         else:
@@ -662,8 +659,7 @@ def format(
             positioned inside the axes. This can help them stand out on top
             of artists plotted inside the axes. Defaults are
             :rc:`abc.border` and :rc:`title.border`
-        ltitle, rtitle, ultitle, uctitle, urtitle, lltitle, lctitle, lrtitle \
-: str, optional
+        ltitle, rtitle, ultitle, uctitle, urtitle, lltitle, lctitle, lrtitle : str, optional
             Axes titles in particular positions. This lets you specify multiple
             "titles" for each subplots. See the `abcloc` keyword.
         top : bool, optional
@@ -675,8 +671,7 @@ def format(
         llabels, tlabels, rlabels, blabels : list of str, optional
             Aliases for `leftlabels`, `toplabels`, `rightlabels`,
             `bottomlabels`.
-        leftlabels, toplabels, rightlabels, bottomlabels : list of str, \
-optional
+        leftlabels, toplabels, rightlabels, bottomlabels : list of str, optional
             The subplot row and column labels. If list, length must match
             the number of subplots on the left, top, right, or bottom edges
             of the figure.
@@ -701,7 +696,7 @@ def format(
         :py:obj:`XYAxes.format`,
         :py:obj:`ProjAxes.format`,
         :py:obj:`PolarAxes.format`,
-        """
+        """  # noqa
         # Figure patch (for some reason needs to be re-asserted even if
         # declared before figure is drawn)
         kw = rc.fill({'facecolor': 'figure.facecolor'}, context=True)
@@ -908,7 +903,6 @@ def colorbar(
             For outer colorbars only. The space between the colorbar and the
             main axes. Units are interpreted by `~proplot.utils.units`.
             When :rcraw:`tight` is ``True``, this is adjusted automatically.
-            Otherwise, the default is :rc:`subplots.panelpad`.
         frame, frameon : bool, optional
             For inset colorbars, indicates whether to draw a "frame", just
             like `~matplotlib.axes.Axes.legend`. Default is
@@ -947,34 +941,30 @@ def colorbar(
             self.patch.set_alpha(0)
             self._panel_filled = True
 
-            # Draw colorbar with arbitrary length relative to full length
-            # of panel
+            # Draw colorbar with arbitrary length relative to full panel length
+            # TODO: Can completely remove references to GridSpecFromSubplotSpec
+            # if implement colorbars as "parasite" objects instead.
             side = self._panel_side
             length = _notNone(length, rc['colorbar.length'])
-            subplotspec = self.get_subplotspec()
+            ss = self.get_subplotspec()
             if length <= 0 or length > 1:
                 raise ValueError(
                     f'Panel colorbar length must satisfy 0 < length <= 1, '
                     f'got length={length!r}.'
                 )
             if side in ('bottom', 'top'):
-                gridspec = mgridspec.GridSpecFromSubplotSpec(
+                gs = mgridspec.GridSpecFromSubplotSpec(
                     nrows=1, ncols=3, wspace=0,
-                    subplot_spec=subplotspec,
+                    subplot_spec=ss,
                     width_ratios=((1 - length) / 2, length, (1 - length) / 2),
                 )
-                subplotspec = gridspec[1]
             else:
-                gridspec = mgridspec.GridSpecFromSubplotSpec(
+                gs = mgridspec.GridSpecFromSubplotSpec(
                     nrows=3, ncols=1, hspace=0,
-                    subplot_spec=subplotspec,
+                    subplot_spec=ss,
                     height_ratios=((1 - length) / 2, length, (1 - length) / 2),
                 )
-                subplotspec = gridspec[1]
-            with self.figure._authorize_add_subplot():
-                ax = self.figure.add_subplot(subplotspec, projection=None)
-            if ax is self:
-                raise ValueError  # should never happen
+            ax = self.figure.add_subplot(gs[1], main=False, projection=None)
             self.add_child_axes(ax)
 
             # Location
@@ -1150,7 +1140,6 @@ def legend(self, *args, loc=None, width=None, space=None, **kwargs):
             For outer legends only. The space between the axes and the legend
             box. Units are interpreted by `~proplot.utils.units`.
             When :rcraw:`tight` is ``True``, this is adjusted automatically.
-            Otherwise, the default is :rc:`subplots.panelpad`.
 
         Other parameters
         ----------------
@@ -1250,8 +1239,7 @@ def inset_axes(
         ----------
         bounds : list of float
             The bounds for the inset axes, listed as ``(x, y, width, height)``.
-        transform : {'data', 'axes', 'figure'} or \
-`~matplotlib.transforms.Transform`, optional
+        transform : {'data', 'axes', 'figure'} or `~matplotlib.transforms.Transform`, optional
             The transform used to interpret `bounds`. Can be a
             `~matplotlib.transforms.Transform` object or a string representing
             the `~matplotlib.axes.Axes.transData`,
@@ -1275,7 +1263,7 @@ def inset_axes(
         ----------------
         **kwargs
             Passed to `XYAxes`.
-        """
+        """  # noqa
         # Carbon copy with my custom axes
         if not transform:
             transform = self.transAxes
@@ -1379,7 +1367,6 @@ def panel_axes(self, side, **kwargs):
         space : float or str or list thereof, optional
             Empty space between the main subplot and the panel.
             When :rcraw:`tight` is ``True``, this is adjusted automatically.
-            Otherwise, the default is :rc:`subplots.panelpad`.
         share : bool, optional
             Whether to enable axis sharing between the *x* and *y* axes of the
             main subplot and the panel long axes for each panel in the stack.
@@ -2628,8 +2615,7 @@ def altx(self, **kwargs):
         # See https://github.com/matplotlib/matplotlib/blob/master/lib/matplotlib/axes/_subplots.py  # noqa
         if self._altx_child or self._altx_parent:
             raise RuntimeError('No more than *two* twin axes are allowed.')
-        with self.figure._authorize_add_subplot():
-            ax = self._make_twin_axes(sharey=self, projection='xy')
+        ax = self._make_twin_axes(sharey=self, projection='xy')
         ax.set_autoscaley_on(self.get_autoscaley_on())
         ax.grid(False)
         self._altx_child = ax
@@ -2645,8 +2631,7 @@ def alty(self, **kwargs):
         """Docstring is replaced below."""
         if self._alty_child or self._alty_parent:
             raise RuntimeError('No more than *two* twin axes are allowed.')
-        with self.figure._authorize_add_subplot():
-            ax = self._make_twin_axes(sharex=self, projection='xy')
+        ax = self._make_twin_axes(sharex=self, projection='xy')
         ax.set_autoscalex_on(self.get_autoscalex_on())
         ax.grid(False)
         self._alty_child = ax
@@ -3737,7 +3722,7 @@ def _format_apply(
             p.set_clip_on(False)  # so edges denoting boundary aren't cut off
             self._map_boundary = p
         else:
-            self.patch.update({**kw_face, 'edgecolor': 'none'})
+            self.patch.update(edgecolor='none', **kw_face)
             for spine in self.spines.values():
                 spine.update(kw_edge)
 

diff --git a/proplot/axistools.py b/proplot/axistools.py
@@ -422,7 +422,6 @@ def __init__(
         axis scales like `~proplot.axistools.LogScale`. We try to correct
         this behavior with a patch.
         """
-        tickrange = tickrange or (-np.inf, np.inf)
         super().__init__(*args, **kwargs)
         zerotrim = _notNone(zerotrim, rc['axes.formatter.zerotrim'])
         self._zerotrim = zerotrim

diff --git a/proplot/external/hsluv.py b/proplot/external/hsluv.py
@@ -26,7 +26,7 @@
 * `rgb_to_hsluv`
 * `hpluv_to_rgb`
 * `rgb_to_hpluv`
-"""
+"""  # noqa
 # Imports (below functions are just meant to be used by user)
 # See: https://stackoverflow.com/a/2353265/4970632
 # The HLS is actually HCL

diff --git a/proplot/styletools.py b/proplot/styletools.py
@@ -724,6 +724,7 @@ class LinearSegmentedColormap(mcolors.LinearSegmentedColormap, _Colormap):
     r"""
     New base class for all `~matplotlib.colors.LinearSegmentedColormap`\ s.
     """
+
     def __str__(self):
         return type(self).__name__ + f'(name={self.name!r})'
 
@@ -1269,6 +1270,7 @@ class ListedColormap(mcolors.ListedColormap, _Colormap):
     r"""
     New base class for all `~matplotlib.colors.ListedColormap`\ s.
     """
+
     def __str__(self):
         return f'ListedColormap(name={self.name!r})'
 
@@ -1532,7 +1534,6 @@ def __init__(
         ...     'luminance': [[0, 100, 100], [1, 20, 20]],
         ... }
         >>> cmap = plot.PerceptuallyUniformColormap(data)
-
         """
         # Checks
         space = _notNone(space, 'hsl').lower()
@@ -2519,7 +2520,6 @@ class BinNorm(mcolors.BoundaryNorm):
        `norm` is compared against the normalized `levels` array. Its bin index
        is determined with `numpy.searchsorted`, and its corresponding
        colormap coordinate is selected using this index.
-
     """
     # See this post: https://stackoverflow.com/a/48614231/4970632
     # WARNING: Must be child of BoundaryNorm. Many methods in ColorBarBase
@@ -2666,6 +2666,7 @@ class LinearSegmentedNorm(mcolors.Normalize):
     Can be used by passing ``norm='segmented'`` or ``norm='segments'`` to any
     command accepting ``cmap``. The default midpoint is zero.
     """
+
     def __init__(self, levels, vmin=None, vmax=None, **kwargs):
         """
         Parameters