Merge branch 'master' into allow-add-subplot

Author: lukelbd

docs/requirements.txt

@@ -2,6 +2,7 @@
 # WARNING: Pip install hangs onto older commits unless __version__ is changed
 # since otherwise setup.py will not think it is necessary to rebuild
 lxml>=4.0.0
+pyyaml>=5.0.0
 numpy>=1.14
 ipython>=7.0.0
 matplotlib>=3.0

proplot/__init__.py

@@ -35,7 +35,8 @@ def _warning_proplot(message, category, filename, lineno, line=None):
 # WARNING: Import order is meaningful! Loads modules that are dependencies
 # of other modules last, and loads styletools early so we can try to update
 # TTFPATH before the fontManager is loaded by other matplotlib modules
-from .utils import * # misc stuff, debug mode
+from .utils import DEBUG
+from .utils import *
 if DEBUG:
     import time
     t = time.clock()

proplot/axes.py

@@ -2957,13 +2957,14 @@ def _format_apply(self, patch_kw, lonlim, latlim, boundinglat,
                     latlines[-1] -= eps
                 gl.ylocator = mticker.FixedLocator(latlines)
         # Grid label toggling
-        if not isinstance(self.projection, (ccrs.Mercator, ccrs.PlateCarree)):
-            if latarray is not None and any(latarray):
-                warnings.warn(f'Cannot add gridline labels on cartopy {self.projection} projection.')
-                latarray = [0]*4
-            if lonarray is not None and any(lonarray):
-                warnings.warn(f'Cannot add gridline labels on cartopy {self.projection} projection.')
-                lonarray = [0]*4
+        # Let cartopy issue warning when no labels possible
+        # if not isinstance(self.projection, (ccrs.Mercator, ccrs.PlateCarree)):
+        #     if latarray is not None and any(latarray):
+        #         warnings.warn(f'Cannot add gridline labels on cartopy {self.projection} projection.')
+        #         latarray = [0]*4
+        #     if lonarray is not None and any(lonarray):
+        #         warnings.warn(f'Cannot add gridline labels on cartopy {self.projection} projection.')
+        #         lonarray = [0]*4
         if latarray is not None:
             gl.ylabels_left   = latarray[0]
             gl.ylabels_right  = latarray[1]

proplot/axistools.py

@@ -802,7 +802,8 @@ def __init__(self, axis, **kwargs):
         def get_transform(self):
             return self._transform
         def set_default_locators_and_formatters(self, axis):
-            axis.set_smart_bounds(True) # may prevent ticks from extending off sides
+            # TODO: add example to bug list, smart bounds screws up ticking!
+            # axis.set_smart_bounds(True) # may prevent ticks from extending off sides
             axis.set_major_formatter(Formatter('default'))
             axis.set_minor_formatter(Formatter('null'))
 

proplot/subplots.py

@@ -567,7 +567,7 @@ def _panels_kwargs(side,
         default = rc['subplots.panelwidth']
     share = _notNone(share, (not filled))
     width = units(_notNone(width, default))
-    space = _notNone(space, units(rc['subplots.' + ('panel' if share
+    space = _notNone(units(space), units(rc['subplots.' + ('panel' if share
         and not figure
         else 'xlab' if s == 'b' else 'ylab' if s == 'l'
         else 'inner' if figure else 'panel') + 'space']))
@@ -1827,14 +1827,6 @@ def subplots(array=None, ncols=1, nrows=1,
 
     Parameters
     ----------
-    ncols, nrows : int, optional
-        Number of columns, rows. Ignored if `array` is not ``None``.
-        Use these arguments for simpler subplot grids.
-    order : {'C', 'F'}, optional
-        Whether subplots are numbered in column-major (``'C'``) or row-major
-        (``'F'``) order. Analogous to `numpy.array` ordering. This controls
-        the order axes appear in the `axs` list, and the order of subplot
-        a-b-c labeling (see `~proplot.axes.Axes.format`).
     array : array-like of int, optional
         2-dimensional array specifying complex grid of subplots. Think of
         this array as a "picture" of your figure. For example, the array
@@ -1845,6 +1837,14 @@ def subplots(array=None, ncols=1, nrows=1,
         ``0`` indicates an empty space. For example, ``[[1, 1, 1], [2, 0, 3]]``
         creates one long subplot in the top row with two subplots in the bottom
         row separated by a space.
+    ncols, nrows : int, optional
+        Number of columns, rows. Ignored if `array` is not ``None``.
+        Use these arguments for simpler subplot grids.
+    order : {'C', 'F'}, optional
+        Whether subplots are numbered in column-major (``'C'``) or row-major
+        (``'F'``) order. Analogous to `numpy.array` ordering. This controls
+        the order axes appear in the `axs` list, and the order of subplot
+        a-b-c labeling (see `~proplot.axes.Axes.format`).
     figsize : length-2 tuple, optional
         Tuple specifying the figure `(width, height)`.
     width, height : float or str, optional

proplot/utils.py

@@ -16,33 +16,6 @@
     ic = lambda *a: None if not a else (a[0] if len(a) == 1 else a) # noqa
 __all__ = ['arange', 'edges', 'units', 'DEBUG']
 
-# Important private helper func
-def _notNone(*args, names=None):
-    """Returns the first non-``None`` value, used with keyword arg aliases and
-    for setting default values. Ugly name but clear purpose. Pass the `names`
-    keyword arg to issue warning if multiple args were passed. Must be list
-    of non-empty strings."""
-    if names is None:
-        for arg in args:
-            if arg is not None:
-                return arg
-        return arg # last one
-    else:
-        ret = {}
-        first = None
-        if len(names) != len(args) - 1:
-            raise ValueError(f'Need {len(args)+1} names for {len(args)} args, but got {len(names)} names.')
-        names = [*names, '']
-        for name,arg in zip(names,args):
-            if arg is not None:
-                if first is None:
-                    first = arg
-                if name:
-                    ret[name] = arg
-        if len(ret)>1:
-            warnings.warn(f'Got conflicting or duplicate keyword args, using the first one: {ret}')
-        return first
-
 # Debug decorators
 DEBUG = False # debug mode, used for profiling and activating timer decorators
 def _logger(func):
@@ -86,6 +59,33 @@ def decorator(*args, **kwargs):
     decorator.count = 0 # initialize
     return decorator
 
+# Important private helper func
+def _notNone(*args, names=None):
+    """Returns the first non-``None`` value, used with keyword arg aliases and
+    for setting default values. Ugly name but clear purpose. Pass the `names`
+    keyword arg to issue warning if multiple args were passed. Must be list
+    of non-empty strings."""
+    if names is None:
+        for arg in args:
+            if arg is not None:
+                return arg
+        return arg # last one
+    else:
+        first = None
+        kwargs = {}
+        if len(names) != len(args) - 1:
+            raise ValueError(f'Need {len(args)+1} names for {len(args)} args, but got {len(names)} names.')
+        names = [*names, '']
+        for name,arg in zip(names,args):
+            if arg is not None:
+                if first is None:
+                    first = arg
+                if name:
+                    kwargs[name] = arg
+        if len(kwargs)>1:
+            warnings.warn(f'Got conflicting or duplicate keyword args, using the first one: {kwargs}')
+        return first
+
 # Accessible for user
 def arange(min_, *args):
     """Identical to `numpy.arange`, but with inclusive endpoints. For