Minor cleanup and typo fixes

Author: lukelbd

docs/authors.rst

@@ -38,8 +38,8 @@ related to climate science, and has authored a number of
 as an avid vim user.
 
 `Riley Brady`_ is the next-biggest contributor. He helped Luke set up automatic
-testing, deploy this project to PyPi, and make proplot easier for new users. He is
-also proplot's earliest user and helped fix `a lot of the early bugs
+testing, deploy this project to PyPi, and improve new user experience. He is
+also proplot's earliest user and helped fix `lots of early bugs
 <https://github.com/lukelbd/proplot/issues?q=is%3Aissue+is%3Aclosed>`__.
 
 .. _Luke Davis: https://github.com/lukelbd

docs/configuration.rst

@@ -85,13 +85,13 @@ They should almost always be changed with `~proplot.config.rc` rather than
 `~proplot.config.rc_proplot` to ensure that :ref:`meta-settings <ug_meta>` are
 synced. These settings are not found in `~matplotlib.rcParams` -- they either
 control proplot-managed features (e.g., a-b-c labels and geographic gridlines)
-or they represent existing matplotlib settings rearranged to be
-more clearly ordered. Here's a broad overview of the new settings:
+or they represent existing matplotlib settings with more clear or succinct names.
+Here's a broad overview of the new settings:
 
 * The ``subplots`` category includes settings that control the default
   subplot layout and padding.
-* The ``basemap`` setting controls whether basemap is the default geographic plotting
-  backend, and the ``cartopy`` category includes cartopy-specific settings.
+* The ``geo`` category contains settings related to geographic plotting, including the
+  geographic backend, gridline label settings, and map bound settings.
 * The ``abc``, ``title``, and ``label`` categories control a-b-c labels, axes
   titles, and axis labels. The latter two replace ``axes.title`` and ``axes.label``.
 * The ``suptitle``, ``leftlabel``, ``toplabel``, ``rightlabel``, and ``bottomlabel``

docs/fonts.py

@@ -47,18 +47,18 @@
 # the open source `TeX Gyre fonts <https://ctan.org/pkg/tex-gyre?lang=en>`__ and a few
 # additional open source sans-serif fonts. Proplot also uses the TeX Gyre fonts as the
 # first (i.e., default) entries for each of matplotlib's `font family lists
-# <https://matplotlib.org/stable/tutorials/text/text_props.html#default-font>`__`:
+# <https://matplotlib.org/stable/tutorials/text/text_props.html#default-font>`__:
 #
 # * The `Helvetica <https://en.wikipedia.org/wiki/Helvetica>`__ lookalike
 #   :rcraw:`font.sans-serif` = ``'TeX Gyre Heros'``.
 # * The `Century <https://en.wikipedia.org/wiki/Century_type_family>`__ lookalike
 #   :rcraw:`font.serif` = ``'TeX Gyre Schola'``.
-# * The `Courier <https://en.wikipedia.org/wiki/Courier_(typeface)>`__ lookalike
-#   :rcraw:`font.monospace` = ``'TeX Gyre Cursor'``.
 # * The `Chancery <https://en.wikipedia.org/wiki/ITC_Zapf_Chancery>`__ lookalike
 #   :rcraw:`font.cursive` = ``'TeX Gyre Chorus'``.
 # * The `Avant Garde <https://en.wikipedia.org/wiki/ITC_Avant_Garde>`__ lookalike
 #   :rcraw:`font.fantasy` = ``'TeX Gyre Adventor'``.
+# * The `Courier <https://en.wikipedia.org/wiki/Courier_(typeface)>`__ lookalike
+#   :rcraw:`font.monospace` = ``'TeX Gyre Cursor'``.
 #
 # After importing proplot, the default matplotlib font will be
 # `TeX Gyre Heros <https://ctan.org/pkg/tex-gyre-heros>`__, which

proplot/axes/geo.py

@@ -29,10 +29,8 @@
     _GeoAxes = Projection = object
 
 try:
-    import mpl_toolkits.basemap as mbasemap
     from mpl_toolkits.basemap import Basemap
 except ModuleNotFoundError:
-    mbasemap = None
     Basemap = object
 
 __all__ = ['GeoAxes']
@@ -95,10 +93,7 @@
 lonminorlines_kw, latminorlines_kw : optional
     Aliases for `lonminorlocator_kw`, `latminorlocator_kw`.
 lonminorlocator_kw, latminorlocator_kw : optional
-    As with `lonlocator_kw` and `latlocator_kw` but for the "minor" gridlines.
-labels : bool, str, or sequence, default:
-    Sets `lonlabels` and `latlabels` to the same value. To draw
-    labels by default use e.g. ``pplt.rc['grid.labels'] = True``.
+    As with `lonlocator_kw`, and `latlocator_kw` but for the "minor" gridlines.
 lonlabels, latlabels, labels : str, bool, or sequence, :rc:`grid.labels`
     Whether to add non-inline longitude and latitude gridline labels, and on
     which sides of the map. Use the keyword `labels` to set both at once. The
@@ -132,14 +127,14 @@
     %(units.pt)s
 dms : bool, default: :rc:`grid.dmslabels`
     *For cartopy axes only.*
-    Whether the default locators and formatters should use "minutes" and "seconds" for
-    gridline labels on small scales rather than decimal degrees. Setting this to
-    ``False`` is equivalent to ``ax.format(lonlocator='deglon', latlocator='deglon')``
+    Whether the default locators and formatters should use "minutes" and "seconds"
+    for gridline labels on small scales rather than decimal degrees. Setting this to
+    ``False`` is equivalent to ``ax.format(lonlocator='deglon', latlocator='deglat')``
     and ``ax.format(lonformatter='deglon', latformatter='deglat')``.
 lonformatter, latformatter : formatter-spec, optional
     Formatter used to style longitude and latitude gridline labels.
-    Passed to the `~proplot.constructor.Formatter` constructor. Can
-    be string, list of string, or `matplotlib.ticker.Formatter` instance.
+    Passed to the `~proplot.constructor.Formatter` constructor. Can be
+    string, list of string, or `matplotlib.ticker.Formatter` instance.
 
     For basemap or cartopy < 0.18, the defaults are ``'deglon'`` and
     ``'deglat'``, which correspond to `~proplot.ticker.SimpleFormatter`

proplot/constructor.py

@@ -1508,7 +1508,7 @@ def Proj(
     # on initialization and controls *all* features.
     else:
         # Parse input arguments
-        import mpl_toolkits.basemap as mbasemap
+        from mpl_toolkits.basemap import Basemap
         if name in ('eqc', 'pcarree'):
             name = 'cyl'  # PROJ package aliases
         defaults = {'fix_aspect': True, **PROJ_DEFAULTS.get(name, {})}
@@ -1542,7 +1542,7 @@ def Proj(
             )
         kwargs.update({'resolution': reso, 'projection': name})
         try:
-            proj = mbasemap.Basemap(**kwargs)  # will raise helpful warning
+            proj = Basemap(**kwargs)  # will raise helpful warning
         except ValueError as err:
             message = str(err)
             message = message.strip()