Merge branch 'release-1.3.1' into develop

Author: molinav

CHANGELOG.md

@@ -5,7 +5,7 @@ is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and the
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 since version 1.3.0.
 
-## [Unreleased]
+## [1.3.1] - 2022-01-22
 
 ### Added
 - Support for Python 3.10 (issues [#530] and [#531]).
@@ -16,6 +16,10 @@ since version 1.3.0.
 - Upgrade development requirements for Python 3.10.
 - Move `doc` folder into `packages/basemap`.
 
+### Fixed
+- Fix error message when trying to load high- and full-resolution datasets
+  without installing the `basemap-data-hires` package.
+
 ## [1.3.0] - 2021-12-28
 
 ### Added
@@ -891,7 +895,9 @@ https://github.com/matplotlib/basemap/issues/228
 https://github.com/matplotlib/basemap/issues/179
 
 [Unreleased]:
-https://github.com/matplotlib/basemap/compare/v1.3.0...develop
+https://github.com/matplotlib/basemap/compare/v1.3.1...develop
+[1.3.1]:
+https://github.com/matplotlib/basemap/compare/v1.3.0...v1.3.1
 [1.3.0]:
 https://github.com/matplotlib/basemap/compare/v1.2.2rel...v1.3.0
 [1.2.2]:

packages/basemap/README.md

@@ -45,6 +45,6 @@ https://spdx.org/licenses/LGPL-2.1-only.html
 https://spdx.org/licenses/MIT.html
 
 [`LICENSE`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap/LICENSE
+https://github.com/matplotlib/basemap/blob/v1.3.1/packages/basemap/LICENSE
 [`LICENSE.geos`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap/LICENSE.geos
+https://github.com/matplotlib/basemap/blob/v1.3.1/packages/basemap/LICENSE.geos

packages/basemap/setup.py

@@ -170,7 +170,7 @@ def _default_to_zip(self):
     "name":
         "basemap",
     "version":
-        "1.3.0+dev",
+        "1.3.1",
     "license":
         "MIT",
     "description":

packages/basemap/src/mpl_toolkits/basemap/__init__.py

@@ -64,7 +64,7 @@
     from mpl_toolkits import basemap_data
     basemap_datadir = os.path.abspath(list(basemap_data.__path__)[0])
 
-__version__ = '1.3.0+dev'
+__version__ = "1.3.1"
 
 # module variable that sets the default value for the 'latlon' kwarg.
 # can be set to True by user so plotting functions can take lons,lats
@@ -1223,11 +1223,10 @@ def _readboundarydata(self,name,as_polygons=False):
         read boundary data, clip to map projection region.
         """
         msg = dedent("""
-        Unable to open boundary dataset file. Only the 'crude', 'low',
-        'intermediate' and 'high' resolution datasets are installed by default.
-        If you are requesting a 'full' resolution dataset, you may need to
-        download and install those files separately
-        (see the basemap README for details).""")
+        Unable to open boundary dataset file. Only the 'crude', 'low' and
+        'intermediate' resolution datasets are installed by default. If you
+        are requesting a 'high' or 'full' resolution dataset, you need to
+        install the `basemap-data-hires` package.""")
         # only gshhs coastlines can be polygons.
         if name != 'gshhs': as_polygons=False
         try:

packages/basemap/src/mpl_toolkits/basemap/proj.py

@@ -10,7 +10,7 @@
     # as textwrap.dedent.
     from matplotlib.cbook import dedent
 
-__version__ = '1.3.0+dev'
+__version__ = "1.3.1"
 _dg2rad = math.radians(1.)
 _rad2dg = math.degrees(1.)
 

packages/basemap_data/setup.py

@@ -87,7 +87,7 @@ def _default_to_zip(self):
     "name":
         "basemap_data",
     "version":
-        "1.3.0+dev",
+        "1.3.0",
     "license":
         "GNU Lesser General Public License v3 or later (LGPLv3+)",
     "description":

packages/basemap_data_hires/setup.py

@@ -65,7 +65,7 @@ def _default_to_zip(self):
     "name":
         "basemap_data_hires",
     "version":
-        "1.3.0+dev",
+        "1.3.0",
     "license":
         "GNU Lesser General Public License v3 or later (LGPLv3+)",
     "description":