Merge branch 'master' into allow-add-subplot

proplot-dev · lukelbd · Sep 18, 2019 · Sep 18, 2019 · Sep 18, 2019 · Sep 29, 2019
commit 9499d3d71424fc9d8edea9b9e540c6d6f8f8b08d
diff --git a/proplot/axistools.py b/proplot/axistools.py
@@ -642,7 +642,7 @@ def get_transform(self):
 
 class LinearScale(_ScaleBase, mscale.LinearScale):
     """
-    As with `~matplotlib.scale.LinearScale`. `AutoFormatter` is the new
+    As with `~matplotlib.scale.LinearScale` but with `AutoFormatter` as the
     default major formatter.
     """
     name = 'linear'
@@ -656,7 +656,7 @@ def __init__(self, **kwargs):
 
 class LogitScale(_ScaleBase, mscale.LogitScale):
     """
-    As with `~matplotlib.scale.LogitScale`. `AutoFormatter` is the new
+    As with `~matplotlib.scale.LogitScale` but with `AutoFormatter` as the
     default major formatter.
     """
     name = 'logit'
@@ -678,8 +678,8 @@ def __init__(self, **kwargs):
 
 class LogScale(_ScaleBase, mscale.LogScale):
     """
-    As with `~matplotlib.scale.LogScale`. `AutoFormatter` is the new
-    default major formatter. Separate "``x``" and "``y``" versions of each
+    As with `~matplotlib.scale.LogScale` but with `AutoFormatter` as the
+    default major formatter. Also, "``x``" and "``y``" versions of each
     keyword argument are no longer required.
     """
     name = 'log'
@@ -714,7 +714,7 @@ def __init__(self, **kwargs):
 class SymmetricalLogScale(_ScaleBase, mscale.SymmetricalLogScale):
     """
     As with `~matplotlib.scale.SymmetricLogScale`. `AutoFormatter` is the new
-    default major formatter. Separate "``x``" and "``y``" versions of each
+    default major formatter. Also, "``x``" and "``y``" versions of each
     keyword argument are no longer required.
     """
     name = 'symlog'
@@ -1181,7 +1181,7 @@ class SineLatitudeScale(_ScaleBase, mscale.ScaleBase):
     r"""
     Axis scale that is linear in the *sine* of *x*. The axis limits are
     constrained to fall between ``-90`` and ``+90`` degrees. The scale
-    function is as follows.
+    function is as follows:
 
     .. math::
 
@@ -1363,7 +1363,7 @@ def transform_non_affine(self, a):
 class InverseScale(_ScaleBase, mscale.ScaleBase):
     r"""
     Axis scale that is linear in the *inverse* of *x*. The forward and inverse
-    scale functions are as follows.
+    scale functions are as follows:
 
     .. math::
 

diff --git a/proplot/projs.py b/proplot/projs.py
@@ -147,11 +147,12 @@ def Proj(name, basemap=False, **kwargs):
     if ((CRS is not object and isinstance(name, CRS))
             or (Basemap is not object and isinstance(name, Basemap))):
         proj = name
-    elif not isinstance(proj, str):
+    elif not isinstance(name, str):
         raise ValueError(
-            f'Unexpected Proj() argument {proj!r}. '
+            f'Unexpected Proj() argument {name!r}. '
             'Must be name, mpl_toolkits.basemap.Basemap instance, '
-            'or cartopy.crs.CRS instance.')
+            'or cartopy.crs.CRS instance.'
+        )
     # Basemap
     elif basemap:
         import mpl_toolkits.basemap as mbasemap
@@ -194,41 +195,6 @@ class Aitoff(_WarpedRectangularProjection):
     """The `Aitoff <https://en.wikipedia.org/wiki/Aitoff_projection>`__
     projection."""
     #: Registered projection name.
-    name = 'hammer'
-
-    def __init__(self, central_longitude=0, globe=None,
-                 false_easting=None, false_northing=None):
-        from cartopy._crs import Globe
-        from cartopy.crs import WGS84_SEMIMAJOR_AXIS
-        if globe is None:
-            globe = Globe(semimajor_axis=WGS84_SEMIMAJOR_AXIS, ellipse=None)
-
-        a = globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS
-        b = globe.semiminor_axis or a
-        if b != a or globe.ellipse is not None:
-            _warn_proplot(
-                f'The {self.name!r} projection does not handle '
-                'elliptical globes.'
-            )
-
-        proj4_params = {'proj': 'hammer', 'lon_0': central_longitude}
-        super().__init__(proj4_params, central_longitude,
-                         false_easting=false_easting,
-                         false_northing=false_northing,
-                         globe=globe)
-
-    @property
-    def threshold(self):  # how finely to interpolate line data, etc.
-        return 1e5
-
-    __init__.__doc__ = _proj_doc
-    threshold.__doc__ = _reso_doc
-
-
-class Hammer(_WarpedRectangularProjection):
-    """The `Hammer <https://en.wikipedia.org/wiki/Hammer_projection>`__
-    projection."""
-    #: Registered projection name.
     name = 'aitoff'
 
     def __init__(self, central_longitude=0, globe=None,
@@ -392,8 +358,10 @@ def __init__(self, central_longitude=0.0, globe=None):
 class NorthPolarLambertAzimuthalEqualArea(LambertAzimuthalEqualArea):
     """Analogous to `~cartopy.crs.NorthPolarStereo`."""
     def __init__(self, central_longitude=0.0, globe=None):
-        super().__init__(central_latitude=90,
-                         central_longitude=central_longitude, globe=globe)
+        super().__init__(
+            central_latitude=90,
+            central_longitude=central_longitude, globe=globe
+        )
     __init__.__doc__ = _proj_doc
 
 

diff --git a/proplot/subplots.py b/proplot/subplots.py
@@ -388,10 +388,12 @@ def __repr__(self):  # do not show width and height ratios
         nrows, ncols = self.get_geometry()
         return f'GridSpec({nrows}, {ncols})'
 
-    def __init__(self, nrows=1, ncols=1,
-                 left=None, right=None, bottom=None, top=None,
-                 wspace=None, hspace=None, wratios=None, hratios=None,
-                 width_ratios=None, height_ratios=None):
+    def __init__(
+        self, nrows=1, ncols=1,
+        left=None, right=None, bottom=None, top=None,
+        wspace=None, hspace=None, wratios=None, hratios=None,
+        width_ratios=None, height_ratios=None
+    ):
         """
         Parameters
         ----------
@@ -1638,7 +1640,7 @@ def _add_figure_panel(
 
     def _get_align_coord(self, side, axs):
         """Return the figure coordinate for spanning labels and super titles.
-        The `x` can be ``'x'`` or ``'y'``."""
+        """
         # Get position in figure relative coordinates
         s = side[0]
         x = ('y' if s in 'lr' else 'x')
@@ -1846,7 +1848,7 @@ def _update_figtitle(self, title, **kwargs):
 
     def _update_labels(self, ax, side, labels, **kwargs):
         """Assign side labels and updates label settings. The labels are
-        aligned down the line by geometry_configurators."""
+        aligned down the line by geometry_configurator."""
         s = side[0]
         if s not in 'lrbt':
             raise ValueError(f'Invalid label side {side!r}.')
@@ -2339,42 +2341,6 @@ def ref(self, ref):
         self.stale = True
         self._ref = ref
 
-    def set_size_inches(self, w, h=None, forward=True, auto=False):
-        # Set the figure size and, if this is being called manually or from
-        # an interactive backend, override the geometry tracker so users can
-        # use interactive backends. See #76. Undocumented because this is
-        # only relevant internally.
-        # NOTE: Bitmap renderers use int(Figure.bbox.[width|height]) which
-        # rounds to whole pixels. So when renderer resizes the figure
-        # internally there may be roundoff error! Always compare to *both*
-        # Figure.get_size_inches() and the truncated bbox dimensions times dpi.
-        # Comparison is critical because most renderers call set_size_inches()
-        # before any resizing interaction!
-        if h is None:
-            width, height = w
-        else:
-            width, height = w, h
-        if not all(np.isfinite(_) for _ in (width, height)):
-            raise ValueError(
-                'Figure size must be finite, not ({width}, {height}).'
-            )
-        width_true, height_true = self.get_size_inches()
-        width_trunc = int(self.bbox.width) / self.dpi
-        height_trunc = int(self.bbox.height) / self.dpi
-        if auto:
-            with self._context_resizing():
-                super().set_size_inches(width, height, forward=forward)
-        else:
-            if (  # can have internal resizing not associated with any draws
-                (width not in (width_true, width_trunc)
-                 or height not in (height_true, height_trunc))
-                and not self._is_resizing
-                and not self.canvas._is_idle_drawing  # standard
-                and not getattr(self.canvas, '_draw_pending', None)  # pyqt5
-            ):
-                self._subplots_kw.update(width=width, height=height)
-            super().set_size_inches(width, height, forward=forward)
-
     # Add documentation
     add_gridspec.__doc__ = _gridspec_doc
     set_gridspec.__doc__ = _gridspec_doc
@@ -2467,9 +2433,9 @@ def subplots(
     basemap=False, **kwargs
 ):
     """
-    Create a figure with a single axes or arbitrary grid of axes, analogous
-    to `matplotlib.pyplot.subplots`. The axes can have arbitrary map
-    projections.
+    Create a figure with a single subplot or arbitrary grids of subplots,
+    analogous to `matplotlib.pyplot.subplots`. The subplots can be drawn with
+    arbitrary projections.
 
     Parameters
     ----------
@@ -2588,10 +2554,14 @@ def subplots(
     basemap = _axes_dict(naxs, basemap, kw=False, default=False)
 
     # Standardized user input ratios
-    wratios = np.atleast_1d(_notNone(width_ratios, wratios, 1,
-                                     names=('width_ratios', 'wratios')))
-    hratios = np.atleast_1d(_notNone(height_ratios, hratios, 1,
-                                     names=('height_ratios', 'hratios')))
+    wratios = np.atleast_1d(_notNone(
+        width_ratios, wratios, 1,
+        names=('width_ratios', 'wratios')
+    ))
+    hratios = np.atleast_1d(_notNone(
+        height_ratios, hratios, 1,
+        names=('height_ratios', 'hratios')
+    ))
     if len(wratios) == 1:
         wratios = np.repeat(wratios, (ncols,))
     if len(hratios) == 1:

diff --git a/proplot/utils.py b/proplot/utils.py
@@ -16,7 +16,6 @@
 __all__ = ['arange', 'edges', 'edges2d', 'units']
 NUMBER = re.compile('^([-+]?[0-9._]+([eE][-+]?[0-9_]+)?)(.*)$')
 BENCHMARK = False  # change this to turn on benchmarking
-NUMBER = re.compile('^([-+]?[0-9._]+([eE][-+]?[0-9_]+)?)(.*)$')
 
 
 class _benchmark(object):
@@ -180,7 +179,8 @@ def edges(Z, axis=-1):
     Parameters
     ----------
     Z : array-like
-        Array of any shape or size.
+        Array of any shape or size. Generally, should be monotonically
+        increasing or decreasing along `axis`.
     axis : int, optional
         The axis along which "edges" are calculated. The size of this axis
         will be increased by one.
@@ -190,6 +190,7 @@ def edges(Z, axis=-1):
     `~numpy.ndarray`
         Array of "edge" coordinates.
     """
+    Z = np.asarray(Z)
     Z = np.swapaxes(Z, axis, -1)
     Z = np.concatenate((
         Z[..., :1] - (Z[..., 1] - Z[..., 0]) / 2,
@@ -223,7 +224,8 @@ def edges2d(Z):
     Zb = np.zeros((ny + 1, nx + 1))
     # Inner
     Zb[1:-1, 1:-1] = 0.25 * (
-        Z[1:, 1:] + Z[:-1, 1:] + Z[1:, :-1] + Z[:-1, :-1])
+        Z[1:, 1:] + Z[:-1, 1:] + Z[1:, :-1] + Z[:-1, :-1]
+    )
     # Lower and upper
     Zb[0] += edges(1.5 * Z[0] - 0.5 * Z[1])
     Zb[-1] += edges(1.5 * Z[-1] - 0.5 * Z[-2])