Merge pull request #16495 from anntzer/unbasemap

WeatherGod · web-flow · commit abfdecf6cc63 · 2020-02-13T10:07:56.000-05:00
Deemphasize basemap in user-facing docs.
diff --git a/doc/index.rst b/doc/index.rst
@@ -160,13 +160,12 @@ Third party packages
 
 A large number of :doc:`third party packages <thirdpartypackages/index>`
 extend and build on Matplotlib functionality, including several higher-level
-plotting interfaces (seaborn_, HoloViews_, ggplot_, ...), and two projection
-and mapping toolkits (Basemap_ and Cartopy_).
+plotting interfaces (seaborn_, HoloViews_, ggplot_, ...), and a projection
+and mapping toolkit (Cartopy_).
 
 .. _seaborn: https://seaborn.pydata.org
 .. _HoloViews: https://holoviews.org
 .. _ggplot: http://ggplot.yhathq.com
-.. _Basemap: https://matplotlib.org/basemap
 .. _Cartopy: https://scitools.org.uk/cartopy/docs/latest
 
 Citing Matplotlib
diff --git a/examples/misc/custom_projection.py b/examples/misc/custom_projection.py
@@ -257,9 +257,8 @@ def set_yscale(self, *args, **kwargs):
     # set_xlim and set_ylim to ignore any input.  This also applies to
     # interactive panning and zooming in the GUI interfaces.
     def set_xlim(self, *args, **kwargs):
-        raise TypeError("It is not possible to change axes limits "
-                        "for geographic projections. Please consider "
-                        "using Basemap or Cartopy.")
+        raise TypeError("Changing axes limits of a geographic projection is "
+                        "not supported.  Please consider using Cartopy.")
 
     set_ylim = set_xlim
 
diff --git a/examples/subplots_axes_and_figures/geo_demo.py b/examples/subplots_axes_and_figures/geo_demo.py
@@ -3,10 +3,10 @@
 Geographic Projections
 ======================
 
-This shows 4 possible projections using subplot.  Matplotlib also
-supports `Basemaps Toolkit <https://matplotlib.org/basemap>`_ and
-`Cartopy <http://scitools.org.uk/cartopy>`_ for geographic projections.
+This shows 4 possible geographic projections.  Cartopy_ supports more
+projections.
 
+.. _Cartopy: http://scitools.org.uk/cartopy
 """
 
 import matplotlib.pyplot as plt
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
@@ -147,9 +147,8 @@ def set_yscale(self, *args, **kwargs):
     set_xscale = set_yscale
 
     def set_xlim(self, *args, **kwargs):
-        raise TypeError("It is not possible to change axes limits "
-                        "for geographic projections. Please consider "
-                        "using Basemap or Cartopy.")
+        raise TypeError("Changing axes limits of a geographic projection is "
+                        "not supported.  Please consider using Cartopy.")
 
     set_ylim = set_xlim
 
