From 5190760900c76eef92a5131fca04289458a0a4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Wed, 29 Dec 2021 00:02:03 +0100
Subject: [PATCH 01/21] Start next development cycle 1.3.0+dev

---
 CHANGELOG.md                                          | 2 ++
 packages/basemap/setup.py                             | 2 +-
 packages/basemap/src/mpl_toolkits/basemap/__init__.py | 2 +-
 packages/basemap/src/mpl_toolkits/basemap/proj.py     | 2 +-
 packages/basemap_data/setup.py                        | 2 +-
 packages/basemap_data_hires/setup.py                  | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6e889670..cfffd1716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ 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.0] - 2020-12-28
 
 ### Added
diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py
index 03d36c27f..f8e8eb41f 100644
--- a/packages/basemap/setup.py
+++ b/packages/basemap/setup.py
@@ -170,7 +170,7 @@ def _default_to_zip(self):
     "name":
         "basemap",
     "version":
-        "1.3.0",
+        "1.3.0+dev",
     "license":
         "MIT",
     "description":
diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
index ccf8e0b41..5ac9a0cc2 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py
+++ b/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'
+__version__ = '1.3.0+dev'
 
 # 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
diff --git a/packages/basemap/src/mpl_toolkits/basemap/proj.py b/packages/basemap/src/mpl_toolkits/basemap/proj.py
index f6c2d1f19..0f6fb2600 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/proj.py
+++ b/packages/basemap/src/mpl_toolkits/basemap/proj.py
@@ -10,7 +10,7 @@
     # as textwrap.dedent.
     from matplotlib.cbook import dedent
 
-__version__ = '1.3.0'
+__version__ = '1.3.0+dev'
 _dg2rad = math.radians(1.)
 _rad2dg = math.degrees(1.)
 
diff --git a/packages/basemap_data/setup.py b/packages/basemap_data/setup.py
index 4674b6003..60e053f3d 100644
--- a/packages/basemap_data/setup.py
+++ b/packages/basemap_data/setup.py
@@ -87,7 +87,7 @@ def _default_to_zip(self):
     "name":
         "basemap_data",
     "version":
-        "1.3.0",
+        "1.3.0+dev",
     "license":
         "GNU Lesser General Public License v3 or later (LGPLv3+)",
     "description":
diff --git a/packages/basemap_data_hires/setup.py b/packages/basemap_data_hires/setup.py
index 72f035c41..4697e669f 100644
--- a/packages/basemap_data_hires/setup.py
+++ b/packages/basemap_data_hires/setup.py
@@ -65,7 +65,7 @@ def _default_to_zip(self):
     "name":
         "basemap_data_hires",
     "version":
-        "1.3.0",
+        "1.3.0+dev",
     "license":
         "GNU Lesser General Public License v3 or later (LGPLv3+)",
     "description":

From ca0255c8e4a49ab4ef949fa3b6efa321e8f84484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Wed, 29 Dec 2021 14:15:47 +0100
Subject: [PATCH 02/21] Add closed issues to CHANGELOG

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfffd1716..e648d8600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@ since version 1.3.0.
   - `basemap-data` contains the mandatory data assets required by `basemap`
     to provide minimal functionality.
   - `basemap-data-hires` contains the high-resolution data assets.
+
+  This change together with the precompiled binary wheels in PyPI should solve
+  most of the former installation problems (see issues [#436], [#445], [#456],
+  [#461], [#488], [#489], [#491], [#510], [#525] and [#526]).
 - Upgrade default GEOS library dependency to 3.5.1.
 - Update and clarify licenses. In summary:
   - `basemap`: MIT license.
@@ -32,8 +36,8 @@ since version 1.3.0.
 ### Fixed
 - Fix `Basemap.pcolormesh` for `"ortho"` projection (PR [#476]).
 - Fix `Basemap.arcgisimage` for cylindrical coordinates (PR [#505]).
-- Force `setup.py` to cythonize `_geoslib.pyx` at compile time (issues [#518]
-  and [#521]).
+- Force `setup.py` to cythonize `_geoslib.pyx` at compile time (issues [#487],
+  [#518] and [#521]).
 
 ### Removed
 - Bundled GEOS source code. The same source code can be downloaded using the
@@ -824,14 +828,36 @@ since version 1.3.0.
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#526]:
+https://github.com/matplotlib/basemap/issues/526
+[#525]:
+https://github.com/matplotlib/basemap/issues/525
 [#521]:
 https://github.com/matplotlib/basemap/issues/521
 [#518]:
 https://github.com/matplotlib/basemap/issues/518
+[#510]:
+https://github.com/matplotlib/basemap/issues/510
 [#505]:
 https://github.com/matplotlib/basemap/pull/505
+[#491]:
+https://github.com/matplotlib/basemap/issues/491
+[#489]:
+https://github.com/matplotlib/basemap/issues/489
+[#488]:
+https://github.com/matplotlib/basemap/issues/488
+[#487]:
+https://github.com/matplotlib/basemap/issues/487
 [#476]:
 https://github.com/matplotlib/basemap/pull/476
+[#461]:
+https://github.com/matplotlib/basemap/issues/461
+[#456]:
+https://github.com/matplotlib/basemap/issues/456
+[#445]:
+https://github.com/matplotlib/basemap/issues/445
+[#436]:
+https://github.com/matplotlib/basemap/issues/436
 
 [Unreleased]:
 https://github.com/matplotlib/basemap/compare/v1.3.0...develop

From d0f43e5c1ae10367c7d2a246cca778b4729840f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sun, 2 Jan 2022 23:46:55 +0100
Subject: [PATCH 03/21] Add more closed issues to CHANGELOG

---
 CHANGELOG.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e648d8600..835ca910f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,8 +23,9 @@ since version 1.3.0.
   - `basemap-data-hires` contains the high-resolution data assets.
 
   This change together with the precompiled binary wheels in PyPI should solve
-  most of the former installation problems (see issues [#436], [#445], [#456],
-  [#461], [#488], [#489], [#491], [#510], [#525] and [#526]).
+  most of the former installation problems (see issues [#403], [#405], [#422],
+  [#436], [#445], [#456], [#461], [#488], [#489], [#491], [#510], [#525] and
+  [#526]).
 - Upgrade default GEOS library dependency to 3.5.1.
 - Update and clarify licenses. In summary:
   - `basemap`: MIT license.
@@ -38,10 +39,12 @@ since version 1.3.0.
 - Fix `Basemap.arcgisimage` for cylindrical coordinates (PR [#505]).
 - Force `setup.py` to cythonize `_geoslib.pyx` at compile time (issues [#487],
   [#518] and [#521]).
+- Update `README` files and apply corrections and changes to outdated content
+  (issue [#179]).
 
 ### Removed
 - Bundled GEOS source code. The same source code can be downloaded using the
-  `GeosLibrary` class in `utils`.
+  `GeosLibrary` class in `utils` (issue [#228]).
 - Precompiled `_geoslib.c` file.
 
 ## [1.2.2] - 2020-08-04
@@ -858,6 +861,16 @@ https://github.com/matplotlib/basemap/issues/456
 https://github.com/matplotlib/basemap/issues/445
 [#436]:
 https://github.com/matplotlib/basemap/issues/436
+[#422]:
+https://github.com/matplotlib/basemap/issues/422
+[#405]:
+https://github.com/matplotlib/basemap/issues/405
+[#403]:
+https://github.com/matplotlib/basemap/issues/403
+[#228]:
+https://github.com/matplotlib/basemap/issues/228
+[#179]:
+https://github.com/matplotlib/basemap/issues/179
 
 [Unreleased]:
 https://github.com/matplotlib/basemap/compare/v1.3.0...develop

From fdaf5e858e60852a8f6b987c4ef35f7cc0108d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sun, 2 Jan 2022 23:47:14 +0100
Subject: [PATCH 04/21] Fix wrong release date for 1.3.0 in CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 835ca910f..83d79ddd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ since version 1.3.0.
 
 ## [Unreleased]
 
-## [1.3.0] - 2020-12-28
+## [1.3.0] - 2021-12-28
 
 ### Added
 - Precompiled binary wheels available in PyPI.

From 3e76640780a4ac7f4bf69e5ad548eb6b5aeb4bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Thu, 6 Jan 2022 14:49:16 +0100
Subject: [PATCH 05/21] Delegate setup-msvc action to external repo

---
 .github/actions/setup-msvc/action.yml     | 44 -----------------------
 .github/workflows/basemap-for-windows.yml | 24 ++++++-------
 2 files changed, 10 insertions(+), 58 deletions(-)
 delete mode 100644 .github/actions/setup-msvc/action.yml

diff --git a/.github/actions/setup-msvc/action.yml b/.github/actions/setup-msvc/action.yml
deleted file mode 100644
index ff7c433e8..000000000
--- a/.github/actions/setup-msvc/action.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "Setup MSVC"
-description: "Setup Microsoft Visual C++ compiler"
-
-inputs:
-  arch:
-    description: "Hardware architecture"
-    required: true
-    default: "x64"
-  version:
-    description: "Toolset version"
-    required: true
-    default: "16"
-
-runs:
-  using: "composite"
-  steps:
-    -
-      name: Set MSVC toolchain (v9)
-      shell: pwsh
-      run: |
-        if (-not "${{ env.VS090URL }}") {
-            echo "Missing environment variable VS090URL"
-            exit 1;
-        }
-        Invoke-WebRequest ${{ env.VS090URL }} -OutFile VCForPython27.msi
-        (Start-Process "msiexec" -NoNewWindow -PassThru -ArgumentList         `
-            "/i VCForPython27.msi /qn /l*! output.log").WaitForExit()
-        $MSVCVARS = "VCINSTALLDIR", "WindowsSdkDir", "PATH", "LIB", "LIBPATH", "INCLUDE"
-        $MSVCROOT = "C:\Users\$env:UserName\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0"
-        cmd.exe /c "`"${MSVCROOT}\vcvarsall.bat`" ${{ inputs.arch }} && set" |
-        ForEach-Object {
-            $name, $value = $_ -split '=', 2
-            if (${MSVCVARS} -contains $name) {
-                echo $_ >> $env:GITHUB_ENV
-            }
-        }
-      if: inputs.version == '9'
-    -
-      name: Set MSVC toolchain (v14+)
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: ${{ inputs.arch }}
-        toolset: ${{ inputs.version }}
-      if: inputs.version != '9'
diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
index dfcb6d5ee..1b4cc9680 100644
--- a/.github/workflows/basemap-for-windows.yml
+++ b/.github/workflows/basemap-for-windows.yml
@@ -27,16 +27,16 @@ jobs:
       matrix:
         include:
           - arch: "x64"
-            msvc-toolset: "16"
+            msvc-toolset: "14.16"
             cmake-version: "3.14.7"
           - arch: "x86"
-            msvc-toolset: "16"
+            msvc-toolset: "14.16"
             cmake-version: "3.13.2"
           - arch: "x64"
-            msvc-toolset: "9"
+            msvc-toolset: "9.0"
             cmake-version: "3.14.7"
           - arch: "x86"
-            msvc-toolset: "9"
+            msvc-toolset: "9.0"
             cmake-version: "3.13.2"
       max-parallel: 4
       fail-fast: false
@@ -57,12 +57,10 @@ jobs:
           python-version: "3.6"
       -
         name: Setup MSVC toolset
-        uses: ./.github/actions/setup-msvc
+        uses: pylegacy/actions/setup-msvc@v1
         with:
-          arch: ${{ matrix.arch }}
+          architecture: ${{ matrix.arch }}
           version: ${{ matrix.msvc-toolset }}
-        env:
-          VS090URL: ${{ secrets.VS090URL }}
       -
         name: Install CMake
         uses: jwlawson/actions-setup-cmake@v1.9
@@ -118,18 +116,16 @@ jobs:
         name: Set MSVC toolset version
         run: |
           if ("${{ matrix.python-version }}" -eq "2.7") {
-              echo "msvc-toolset=9" >> $env:GITHUB_ENV
+              echo "msvc-toolset=9.0" >> $env:GITHUB_ENV
           } else {
-              echo "msvc-toolset=16" >> $env:GITHUB_ENV
+              echo "msvc-toolset=14.16" >> $env:GITHUB_ENV
           }
       -
         name: Setup MSVC toolset
-        uses: ./.github/actions/setup-msvc
+        uses: pylegacy/actions/setup-msvc@v1
         with:
-          arch: ${{ matrix.arch }}
+          architecture: ${{ matrix.arch }}
           version: ${{ env.msvc-toolset }}
-        env:
-          VS090URL: ${{ secrets.VS090URL }}
       -
         name: Install Python base packages
         run: |

From 56e4d3f9d2874ef5df770557eef95c80edfdde1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Thu, 6 Jan 2022 15:59:30 +0100
Subject: [PATCH 06/21] Restrict when workflows are triggered

---
 .github/workflows/basemap-data-hires.yml    | 7 +++++++
 .github/workflows/basemap-data.yml          | 7 +++++++
 .github/workflows/basemap-for-manylinux.yml | 7 +++++++
 .github/workflows/basemap-for-windows.yml   | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
index 4631254e5..b3ea6b15f 100644
--- a/.github/workflows/basemap-data-hires.yml
+++ b/.github/workflows/basemap-data-hires.yml
@@ -5,6 +5,13 @@ env:
 
 on:
   push:
+    paths:
+      - ".github/workflows/basemap-data-hires.yml"
+      - "packages/basemap_data_hires"
+  pull_request:
+    paths:
+      - ".github/workflows/basemap-data-hires.yml"
+      - "packages/basemap_data_hires"
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
index 21058b1c1..8f3ff091a 100644
--- a/.github/workflows/basemap-data.yml
+++ b/.github/workflows/basemap-data.yml
@@ -5,6 +5,13 @@ env:
 
 on:
   push:
+    paths:
+      - ".github/workflows/basemap-data.yml"
+      - "packages/basemap_data"
+  pull_request:
+    paths:
+      - ".github/workflows/basemap-data.yml"
+      - "packages/basemap_data"
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index 95539d45b..80b52126d 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -5,6 +5,13 @@ env:
 
 on:
   push:
+    paths:
+      - ".github/workflows/basemap-for-manylinux.yml"
+      - "packages/basemap"
+  pull_request:
+    paths:
+      - ".github/workflows/basemap-for-manylinux.yml"
+      - "packages/basemap"
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
index 1b4cc9680..4e00fb73b 100644
--- a/.github/workflows/basemap-for-windows.yml
+++ b/.github/workflows/basemap-for-windows.yml
@@ -5,6 +5,13 @@ env:
 
 on:
   push:
+    paths:
+      - ".github/workflows/basemap-for-windows.yml"
+      - "packages/basemap"
+  pull_request:
+    paths:
+      - ".github/workflows/basemap-for-windows.yml"
+      - "packages/basemap"
   workflow_dispatch:
 
 jobs:

From 0167beb70e675b1704f39525ac47588ab8133277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Thu, 6 Jan 2022 19:50:29 +0100
Subject: [PATCH 07/21] Simplify patchelf step in basemap-for-manylinux
 workflow

---
 .github/workflows/basemap-for-manylinux.yml | 23 +++------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index 80b52126d..7364c63fb 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -194,33 +194,16 @@ jobs:
         with:
           name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
           path: ${{ env.PKGDIR }}/dist
-      -
-        name: Install GCC toolchain
-        run: |
-          apt-get update
-          apt-get install -y gcc g++ make
       -
         name: Install unzip
         run: |
           apt-get update
           apt-get install -y unzip
       -
-        name: Install patchelf from source
+        name: Install patchelf
         run: |
-          pkgvers=0.9
-          pkgname=patchelf
-          pkgcode=${pkgname}-${pkgvers}
-          cd /tmp
-          wget https://releases.nixos.org/${pkgname}/${pkgcode}/${pkgcode}.tar.gz
-          tar -xf ${pkgcode}.tar.gz
-          rm -f ${pkgcode}.tar.gz
-          cd ${pkgcode}
-          ./configure
-          make
-          make check
-          make install
-          cd ..
-          rm -rf ${pkgcode}
+          pip install patchelf
+          alias patchelf="python -m patchelf"
       -
         name: Install auditwheel
         run: |

From 2bbb71f993cccfed4f5e419b8f068c96be33e0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Fri, 7 Jan 2022 02:33:56 +0100
Subject: [PATCH 08/21] Reformat workflow files

---
 .github/workflows/basemap-data-hires.yml    | 27 ++-------
 .github/workflows/basemap-data.yml          | 27 ++-------
 .github/workflows/basemap-for-manylinux.yml | 65 ++++-----------------
 .github/workflows/basemap-for-windows.yml   | 62 ++++++--------------
 4 files changed, 41 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
index b3ea6b15f..ce4848bb4 100644
--- a/.github/workflows/basemap-data-hires.yml
+++ b/.github/workflows/basemap-data-hires.yml
@@ -7,11 +7,11 @@ on:
   push:
     paths:
       - ".github/workflows/basemap-data-hires.yml"
-      - "packages/basemap_data_hires"
+      - "packages/basemap_data_hires/**"
   pull_request:
     paths:
       - ".github/workflows/basemap-data-hires.yml"
-      - "packages/basemap_data_hires"
+      - "packages/basemap_data_hires/**"
   workflow_dispatch:
 
 jobs:
@@ -33,13 +33,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          [
-            "2.7",
-          ]
+          ["2.7"]
       max-parallel: 1
     needs: checkout
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
     steps:
       -
         name: Download checkout
@@ -63,18 +61,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          [
-            "2.6",
-            "2.7",
-            "3.2",
-            "3.3",
-            "3.4",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -106,9 +93,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          [
-            "2.7",
-          ]
+          ["2.7"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
index 8f3ff091a..b9a9b30b8 100644
--- a/.github/workflows/basemap-data.yml
+++ b/.github/workflows/basemap-data.yml
@@ -7,11 +7,11 @@ on:
   push:
     paths:
       - ".github/workflows/basemap-data.yml"
-      - "packages/basemap_data"
+      - "packages/basemap_data/**"
   pull_request:
     paths:
       - ".github/workflows/basemap-data.yml"
-      - "packages/basemap_data"
+      - "packages/basemap_data/**"
   workflow_dispatch:
 
 jobs:
@@ -33,13 +33,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          [
-            "2.7",
-          ]
+          ["2.7"]
       max-parallel: 1
     needs: checkout
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
     steps:
       -
         name: Download checkout
@@ -63,18 +61,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          [
-            "2.6",
-            "2.7",
-            "3.2",
-            "3.3",
-            "3.4",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -106,9 +93,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          [
-            "2.7",
-          ]
+          ["2.7"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index 7364c63fb..df6d67099 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -7,11 +7,11 @@ on:
   push:
     paths:
       - ".github/workflows/basemap-for-manylinux.yml"
-      - "packages/basemap"
+      - "packages/basemap/**"
   pull_request:
     paths:
       - ".github/workflows/basemap-for-manylinux.yml"
-      - "packages/basemap"
+      - "packages/basemap/**"
   workflow_dispatch:
 
 jobs:
@@ -33,10 +33,7 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
       max-parallel: 2
       fail-fast: false
     needs: checkout
@@ -85,19 +82,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: build-geos
@@ -163,19 +150,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -225,19 +202,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: repair
@@ -300,19 +267,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
index 4e00fb73b..6ce092156 100644
--- a/.github/workflows/basemap-for-windows.yml
+++ b/.github/workflows/basemap-for-windows.yml
@@ -7,11 +7,11 @@ on:
   push:
     paths:
       - ".github/workflows/basemap-for-windows.yml"
-      - "packages/basemap"
+      - "packages/basemap/**"
   pull_request:
     paths:
       - ".github/workflows/basemap-for-windows.yml"
-      - "packages/basemap"
+      - "packages/basemap/**"
   workflow_dispatch:
 
 jobs:
@@ -33,16 +33,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - arch: "x64"
+          - 
+            arch: "x64"
             msvc-toolset: "14.16"
             cmake-version: "3.14.7"
-          - arch: "x86"
+          - 
+            arch: "x86"
             msvc-toolset: "14.16"
             cmake-version: "3.13.2"
-          - arch: "x64"
+          - 
+            arch: "x64"
             msvc-toolset: "9.0"
             cmake-version: "3.14.7"
-          - arch: "x86"
+          - 
+            arch: "x86"
             msvc-toolset: "9.0"
             cmake-version: "3.13.2"
       max-parallel: 4
@@ -89,19 +93,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: build-geos
@@ -182,19 +176,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -231,19 +215,9 @@ jobs:
     strategy:
       matrix:
         arch:
-          [
-            "x64",
-            "x86",
-          ]
+          ["x64", "x86"]
         python-version:
-          [
-            "2.7",
-            "3.5",
-            "3.6",
-            "3.7",
-            "3.8",
-            "3.9",
-          ]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
@@ -275,6 +249,6 @@ jobs:
         run: |
           python -m twine check                                               `
               ${{ env.PKGDIR }}/dist/*.zip                                    `
-              ${{ env.PKGDIR }}/dist/*-win*.whl
+              ${{ env.PKGDIR }}/dist/*.whl
           python -m twine upload --skip-existing                              `
-              ${{ env.PKGDIR }}/dist/*-win*.whl
+              ${{ env.PKGDIR }}/dist/*.whl

From 0fac82b6e84e7a2c1b80fecf008dc0dcf57ad290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Fri, 7 Jan 2022 14:06:55 +0100
Subject: [PATCH 09/21] Add some issues solved in v1.2.0 to CHANGELOG

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83d79ddd3..8ed54761a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ since version 1.3.0.
 
 ### Fixed
 - Mostly compatibility bugfixes.
+- Fix build using `zsh` as shell instead of `bash` (issues [#362] and [#383]).
 
 ## [1.1.0] - 2017-05-04
 
@@ -867,6 +868,10 @@ https://github.com/matplotlib/basemap/issues/422
 https://github.com/matplotlib/basemap/issues/405
 [#403]:
 https://github.com/matplotlib/basemap/issues/403
+[#383]:
+https://github.com/matplotlib/basemap/issues/383
+[#362]:
+https://github.com/matplotlib/basemap/issues/362
 [#228]:
 https://github.com/matplotlib/basemap/issues/228
 [#179]:

From 708b5251d6a9aa577b395641fb080c261580c20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sun, 16 Jan 2022 18:52:40 +0100
Subject: [PATCH 10/21] Enable Python 3.10 in basemap-for-windows

---
 .github/workflows/basemap-for-windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
index 6ce092156..215cb91e7 100644
--- a/.github/workflows/basemap-for-windows.yml
+++ b/.github/workflows/basemap-for-windows.yml
@@ -95,7 +95,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: build-geos
@@ -178,7 +178,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -217,7 +217,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test

From 1e436ef3c4f5a1637fe609904fd24cd188f5c875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sun, 16 Jan 2022 19:31:43 +0100
Subject: [PATCH 11/21] Fix NumPy version setup in basemap-for-windows

---
 .github/workflows/basemap-for-windows.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
index 215cb91e7..a3061dcb7 100644
--- a/.github/workflows/basemap-for-windows.yml
+++ b/.github/workflows/basemap-for-windows.yml
@@ -134,15 +134,18 @@ jobs:
       -
         name: Generate NumPy headers
         run: |
-          if ("${{ matrix.python-version }}" -lt "3.5") {
+          if ("${{ matrix.python-version }}" -In "2.6", "3.2", "3.3") {
               Set-Variable -Name "pkgvers" -Value "1.11.3"
-          } else {
+          } elseif ("${{ matrix.python-version }}" -In "2.7", "3.4", "3.5", "3.6") {
               Set-Variable -Name "pkgvers" -Value "1.16.6"
+          } else {
+              Set-Variable -Name "pkgvers" -Value "1.21.5"
           }
           Set-Variable -Name "pkgname" -Value "numpy"
           Set-Variable -Name "pkgcode" -Value "numpy-${pkgvers}"
           Set-Variable -Name "includedir" -Value "numpy/core/include"
-          python -m pip download --no-binary=:all: "numpy == ${pkgvers}"
+          python -m pip install cython
+          python -m pip download --no-binary=numpy "numpy == ${pkgvers}"
           tar -xf "${pkgcode}.zip"
           rm "${pkgcode}.zip"
           cd "${pkgcode}"

From 2de31a12d09e38ff5e44e11dccdfdbe453742249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Mon, 17 Jan 2022 00:04:48 +0100
Subject: [PATCH 12/21] Enable Python 3.10 in basemap-for-manylinux

---
 .github/workflows/basemap-for-manylinux.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index df6d67099..c55ace78d 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -84,7 +84,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: build-geos
@@ -117,8 +117,9 @@ jobs:
         name: Generate NumPy headers
         run: |
           case "${{ matrix.python-version }}" in
-              2.[67]|3.[01234])  pkgvers=1.11.3;;
-              *)                 pkgvers=1.16.6;;
+              2.6|3.[23])   pkgvers=1.11.3;;
+              2.7|3.[456])  pkgvers=1.16.6;;
+              *)            pkgvers=1.21.5;;
           esac
           pkgname=numpy
           pkgcode=numpy-${pkgvers}
@@ -152,7 +153,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -204,7 +205,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: repair
@@ -251,7 +252,7 @@ jobs:
           python -m pip install .
           cd ..
           rm -rf ${pkgcode}
-        if: matrix.python-version == '3.9'
+        if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
         env:
           pyproj-version: 1.9.6
       -
@@ -269,7 +270,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test

From deb52ad37e87d45fed5bb10f5e87b8680f2f8dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Fri, 21 Jan 2022 14:16:29 +0100
Subject: [PATCH 13/21] Prepare dev requirements for Python 3.10

---
 CHANGELOG.md                          | 3 +++
 packages/basemap/requirements-dev.txt | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed54761a..4d8641313 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ since version 1.3.0.
 
 ## [Unreleased]
 
+## Changed
+- Upgrade development requirements for Python 3.10.
+
 ## [1.3.0] - 2021-12-28
 
 ### Added
diff --git a/packages/basemap/requirements-dev.txt b/packages/basemap/requirements-dev.txt
index ee5df4a6c..cd160ceae 100644
--- a/packages/basemap/requirements-dev.txt
+++ b/packages/basemap/requirements-dev.txt
@@ -10,14 +10,15 @@ astroid >= 2.4, < 3.0; python_version >= "3.5"
 pylint >= 1.9, < 2.0; python_version == "2.7"
 pylint >= 2.6, < 3.0; python_version >= "3.5"
 
-unittest2
+unittest2; python_version >= "3.10"
 
 pytest >= 3.2, < 3.3; python_version == "2.6"
 pytest >= 3.2, < 5.0; python_version == "2.7"
 pytest >= 2.9, < 3.0; python_version == "3.2"
 pytest >= 3.2, < 3.3; python_version == "3.3"
 pytest >= 3.2, < 5.0; python_version == "3.4"
-pytest >= 3.2, < 6.3; python_version >= "3.5"
+pytest >= 3.2, < 6.3; python_version == "3.5"
+pytest >= 6.2.5, < 6.3; python_version >= "3.6"
 
 coverage >= 3.7, < 4.0; python_version == "3.2"
 pytest-cov >= 2.5, < 2.6; python_version == "2.6"

From 7b414657d5fd714cb3a2e3ffaf80fc2919b79bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Fri, 21 Jan 2022 14:23:48 +0100
Subject: [PATCH 14/21] Test basemap-data and basemap-data-hires also in Python
 3.10

---
 .github/workflows/basemap-data-hires.yml | 3 ++-
 .github/workflows/basemap-data.yml       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
index ce4848bb4..edb242a1d 100644
--- a/.github/workflows/basemap-data-hires.yml
+++ b/.github/workflows/basemap-data-hires.yml
@@ -61,7 +61,8 @@ jobs:
     strategy:
       matrix:
         python-version:
-          ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
+           "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: build
diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
index b9a9b30b8..14dbb587a 100644
--- a/.github/workflows/basemap-data.yml
+++ b/.github/workflows/basemap-data.yml
@@ -61,7 +61,8 @@ jobs:
     strategy:
       matrix:
         python-version:
-          ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
+          ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
+           "3.9", "3.10"]
       max-parallel: 3
       fail-fast: false
     needs: build

From bfbe4fae5578dbe5990da5e83e1922587754bf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Fri, 21 Jan 2022 21:09:45 +0100
Subject: [PATCH 15/21] Fix numpy and matplotlib dependency versions

---
 .github/workflows/basemap-for-manylinux.yml | 9 +++++----
 .github/workflows/basemap-for-windows.yml   | 4 ++--
 CHANGELOG.md                                | 1 +
 packages/basemap/requirements.txt           | 9 +++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index c55ace78d..e6a57f1b0 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -117,13 +117,14 @@ jobs:
         name: Generate NumPy headers
         run: |
           case "${{ matrix.python-version }}" in
-              2.6|3.[23])   pkgvers=1.11.3;;
-              2.7|3.[456])  pkgvers=1.16.6;;
-              *)            pkgvers=1.21.5;;
+              2.6|3.[23])      pkgvers=1.11.3;;
+              2.7|3.[456789])  pkgvers=1.16.6;;
+              *)               pkgvers=1.21.4;;
           esac
           pkgname=numpy
           pkgcode=numpy-${pkgvers}
-          python -m pip download --no-binary=:all: "numpy == ${pkgvers}"
+          python -m pip install cython
+          python -m pip download --no-binary=numpy "numpy == ${pkgvers}"
           unzip ${pkgcode}.zip
           rm -f ${pkgcode}.zip
           cd ${pkgcode}
diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
index a3061dcb7..80b5e7d63 100644
--- a/.github/workflows/basemap-for-windows.yml
+++ b/.github/workflows/basemap-for-windows.yml
@@ -136,10 +136,10 @@ jobs:
         run: |
           if ("${{ matrix.python-version }}" -In "2.6", "3.2", "3.3") {
               Set-Variable -Name "pkgvers" -Value "1.11.3"
-          } elseif ("${{ matrix.python-version }}" -In "2.7", "3.4", "3.5", "3.6") {
+          } elseif ("${{ matrix.python-version }}" -In "2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9") {
               Set-Variable -Name "pkgvers" -Value "1.16.6"
           } else {
-              Set-Variable -Name "pkgvers" -Value "1.21.5"
+              Set-Variable -Name "pkgvers" -Value "1.21.4"
           }
           Set-Variable -Name "pkgname" -Value "numpy"
           Set-Variable -Name "pkgcode" -Value "numpy-${pkgvers}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d8641313..782807346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ since version 1.3.0.
 ## [Unreleased]
 
 ## Changed
+- Upgrade `numpy` upper pin to 1.23.
 - Upgrade development requirements for Python 3.10.
 
 ## [1.3.0] - 2021-12-28
diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt
index 3ba8edd6d..33fc2a0bb 100644
--- a/packages/basemap/requirements.txt
+++ b/packages/basemap/requirements.txt
@@ -7,7 +7,12 @@ numpy >= 1.16, < 1.17; python_version == "2.7"
 numpy >= 1.11, < 1.12; python_version == "3.2"
 numpy >= 1.11, < 1.12; python_version == "3.3"
 numpy >= 1.11, < 1.17; python_version == "3.4"
-numpy >= 1.16, < 1.22; python_version >= "3.5"
+numpy >= 1.16, < 1.19; python_version == "3.5"
+numpy >= 1.16, < 1.20; python_version == "3.6"
+numpy >= 1.19, < 1.22; python_version == "3.7"
+numpy >= 1.19, < 1.23; python_version == "3.8"
+numpy >= 1.19, < 1.23; python_version == "3.9"
+numpy >= 1.21, < 1.23; python_version >= "3.10"
 
 cycler < 0.11; python_version == "3.2"
 pyparsing >= 1.5, < 2.4.1; python_version == "2.6"
@@ -17,7 +22,7 @@ matplotlib >= 1.5, < 3.0; python_version == "2.7"
 matplotlib >= 1.5, < 2.0; python_version == "3.2"
 matplotlib >= 1.5, < 2.0; python_version == "3.3"
 matplotlib >= 1.5, < 3.0; python_version == "3.4"
-matplotlib >= 1.5, < 3.5; python_version >= "3.5"
+matplotlib >= 1.5, < 3.6; python_version >= "3.5"
 
 pyproj >= 1.9.3, < 2.1.0; python_version == "2.6"
 pyproj >= 1.9.3, < 2.3.0; python_version == "2.7"

From e195a3bfda6f953320b43243a28fed0ed95c3d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Fri, 21 Jan 2022 22:31:07 +0100
Subject: [PATCH 16/21] Upgrade image base in basemap-for-manylinux outside
 build

Let's make life a bit easier.
---
 .github/workflows/basemap-for-manylinux.yml | 35 ++++++---------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index e6a57f1b0..21c0a1e56 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -159,7 +159,7 @@ jobs:
       fail-fast: false
     needs: build
     runs-on: ubuntu-latest
-    container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-5"
+    container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-8"
     steps:
       -
         name: Download GEOS artifacts
@@ -211,7 +211,7 @@ jobs:
       fail-fast: false
     needs: repair
     runs-on: ubuntu-latest
-    container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-8"
     steps:
       -
         name: Download checkout
@@ -225,37 +225,20 @@ jobs:
         with:
           name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
           path: ${{ env.PKGDIR }}/dist
-      -
-        name: Install GCC toolchain
-        run: |
-          apt-get update
-          apt-get install -y gcc g++ make
       -
         name: Install matplotlib dependencies
         run: |
           apt-get update
-          apt-get install -y libfreetype6-dev libpng12-dev
+          apt-get install -y gcc g++ make
+          apt-get install -y pkg-config libfreetype6-dev libpng12-dev
         if: matrix.arch == 'x86' && matrix.python-version == '3.5'
       -
-        name: Install pyproj manually
+        name: Install numpy from source
         run: |
           apt-get update
-          apt-get install -y proj-bin libproj-dev
-          python -m pip install cython
-          pkgname=pyproj
-          pkgvers=${{ env.pyproj-version }}
-          pkgcode=${pkgname}-${pkgvers}
-          python -m pip download "pyproj == ${pkgvers}"
-          tar -xf ${pkgcode}.tar.gz
-          rm -rf ${pkgcode}.tar.gz
-          cd ${pkgcode}
-          rm _proj.c
-          python -m pip install .
-          cd ..
-          rm -rf ${pkgcode}
-        if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
-        env:
-          pyproj-version: 1.9.6
+          apt-get install -y gcc g++ make
+          pip install "numpy < 1.21.5"
+        if: matrix.arch == 'x86' && matrix.python-version == '3.10'
       -
         name: Install package
         run: |
@@ -276,7 +259,7 @@ jobs:
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
     runs-on: ubuntu-latest
-    container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-8"
     environment: PyPI
     steps:
       -

From 6a00382207714067e5d0b80f2fb6531faa055591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sat, 22 Jan 2022 00:47:07 +0100
Subject: [PATCH 17/21] Move doc folder into packages/basemap/doc

---
 {doc => packages/basemap/doc}/README.txt                        | 0
 {doc => packages/basemap/doc}/api/basemap_api.rst               | 0
 {doc => packages/basemap/doc}/api/index.rst                     | 0
 {doc => packages/basemap/doc}/conf.py                           | 0
 {doc => packages/basemap/doc}/index.rst                         | 0
 {doc => packages/basemap/doc}/make.py                           | 0
 {doc => packages/basemap/doc}/matplotlibrc                      | 0
 {doc => packages/basemap/doc}/users/aea.rst                     | 0
 {doc => packages/basemap/doc}/users/aeqd.rst                    | 0
 {doc => packages/basemap/doc}/users/cass.rst                    | 0
 {doc => packages/basemap/doc}/users/cea.rst                     | 0
 {doc => packages/basemap/doc}/users/cyl.rst                     | 0
 {doc => packages/basemap/doc}/users/download.rst                | 0
 {doc => packages/basemap/doc}/users/eck4.rst                    | 0
 {doc => packages/basemap/doc}/users/eqdc.rst                    | 0
 {doc => packages/basemap/doc}/users/examples.rst                | 0
 {doc => packages/basemap/doc}/users/figures/aea.py              | 0
 {doc => packages/basemap/doc}/users/figures/aeqd.py             | 0
 {doc => packages/basemap/doc}/users/figures/aeqd_fulldisk.py    | 0
 {doc => packages/basemap/doc}/users/figures/azeqd.py            | 0
 {doc => packages/basemap/doc}/users/figures/background1.py      | 0
 {doc => packages/basemap/doc}/users/figures/background2.py      | 0
 {doc => packages/basemap/doc}/users/figures/background3.py      | 0
 {doc => packages/basemap/doc}/users/figures/background4.py      | 0
 {doc => packages/basemap/doc}/users/figures/background5.py      | 0
 {doc => packages/basemap/doc}/users/figures/cass.py             | 0
 {doc => packages/basemap/doc}/users/figures/cea.py              | 0
 {doc => packages/basemap/doc}/users/figures/contour1.py         | 0
 {doc => packages/basemap/doc}/users/figures/cyl.py              | 0
 {doc => packages/basemap/doc}/users/figures/eck4.py             | 0
 {doc => packages/basemap/doc}/users/figures/eqdc.py             | 0
 {doc => packages/basemap/doc}/users/figures/gall.py             | 0
 {doc => packages/basemap/doc}/users/figures/geos_full.py        | 0
 {doc => packages/basemap/doc}/users/figures/geos_partial.py     | 0
 {doc => packages/basemap/doc}/users/figures/gnomon.py           | 0
 {doc => packages/basemap/doc}/users/figures/graticule.py        | 0
 {doc => packages/basemap/doc}/users/figures/hammer.py           | 0
 {doc => packages/basemap/doc}/users/figures/hurrtracks.py       | 0
 {doc => packages/basemap/doc}/users/figures/kav7.py             | 0
 {doc => packages/basemap/doc}/users/figures/laea.py             | 0
 {doc => packages/basemap/doc}/users/figures/lcc.py              | 0
 {doc => packages/basemap/doc}/users/figures/mbtfpq.py           | 0
 {doc => packages/basemap/doc}/users/figures/merc.py             | 0
 {doc => packages/basemap/doc}/users/figures/mill.py             | 0
 {doc => packages/basemap/doc}/users/figures/moll.py             | 0
 {doc => packages/basemap/doc}/users/figures/npaeqd.py           | 0
 {doc => packages/basemap/doc}/users/figures/nplaea.py           | 0
 {doc => packages/basemap/doc}/users/figures/npstere.py          | 0
 {doc => packages/basemap/doc}/users/figures/nsper_full.py       | 0
 {doc => packages/basemap/doc}/users/figures/nsper_partial.py    | 0
 {doc => packages/basemap/doc}/users/figures/omerc.py            | 0
 {doc => packages/basemap/doc}/users/figures/ortho_full.py       | 0
 {doc => packages/basemap/doc}/users/figures/ortho_partial.py    | 0
 {doc => packages/basemap/doc}/users/figures/plotargo.py         | 0
 {doc => packages/basemap/doc}/users/figures/plotboulder.py      | 0
 {doc => packages/basemap/doc}/users/figures/plotdaynight.py     | 0
 {doc => packages/basemap/doc}/users/figures/plotetopo5.py       | 0
 {doc => packages/basemap/doc}/users/figures/plotgreatcircle.py  | 0
 {doc => packages/basemap/doc}/users/figures/plothighsandlows.py | 0
 {doc => packages/basemap/doc}/users/figures/plotprecip.py       | 0
 {doc => packages/basemap/doc}/users/figures/plotsst.py          | 0
 {doc => packages/basemap/doc}/users/figures/plotwindvec.py      | 0
 {doc => packages/basemap/doc}/users/figures/poly.py             | 0
 {doc => packages/basemap/doc}/users/figures/robin.py            | 0
 {doc => packages/basemap/doc}/users/figures/sinu.py             | 0
 {doc => packages/basemap/doc}/users/figures/spaeqd.py           | 0
 {doc => packages/basemap/doc}/users/figures/splaea.py           | 0
 {doc => packages/basemap/doc}/users/figures/spstere.py          | 0
 {doc => packages/basemap/doc}/users/figures/stere.py            | 0
 {doc => packages/basemap/doc}/users/figures/tmerc.py            | 0
 {doc => packages/basemap/doc}/users/figures/vandg.py            | 0
 {doc => packages/basemap/doc}/users/gall.rst                    | 0
 {doc => packages/basemap/doc}/users/geography.rst               | 0
 {doc => packages/basemap/doc}/users/geos.rst                    | 0
 {doc => packages/basemap/doc}/users/gnomon.rst                  | 0
 {doc => packages/basemap/doc}/users/graticule.rst               | 0
 {doc => packages/basemap/doc}/users/hammer.rst                  | 0
 {doc => packages/basemap/doc}/users/index.rst                   | 0
 {doc => packages/basemap/doc}/users/installing.rst              | 0
 {doc => packages/basemap/doc}/users/intro.rst                   | 0
 {doc => packages/basemap/doc}/users/kav7.rst                    | 0
 {doc => packages/basemap/doc}/users/laea.rst                    | 0
 {doc => packages/basemap/doc}/users/lcc.rst                     | 0
 {doc => packages/basemap/doc}/users/mapcoords.rst               | 0
 {doc => packages/basemap/doc}/users/mapsetup.rst                | 0
 {doc => packages/basemap/doc}/users/mbtfpq.rst                  | 0
 {doc => packages/basemap/doc}/users/merc.rst                    | 0
 {doc => packages/basemap/doc}/users/mill.rst                    | 0
 {doc => packages/basemap/doc}/users/moll.rst                    | 0
 {doc => packages/basemap/doc}/users/nsper.rst                   | 0
 {doc => packages/basemap/doc}/users/omerc.rst                   | 0
 {doc => packages/basemap/doc}/users/ortho.rst                   | 0
 {doc => packages/basemap/doc}/users/paeqd.rst                   | 0
 {doc => packages/basemap/doc}/users/plaea.rst                   | 0
 {doc => packages/basemap/doc}/users/poly.rst                    | 0
 {doc => packages/basemap/doc}/users/pstere.rst                  | 0
 {doc => packages/basemap/doc}/users/robin.rst                   | 0
 {doc => packages/basemap/doc}/users/sinu.rst                    | 0
 {doc => packages/basemap/doc}/users/stere.rst                   | 0
 {doc => packages/basemap/doc}/users/tmerc.rst                   | 0
 {doc => packages/basemap/doc}/users/vandg.rst                   | 0
 101 files changed, 0 insertions(+), 0 deletions(-)
 rename {doc => packages/basemap/doc}/README.txt (100%)
 rename {doc => packages/basemap/doc}/api/basemap_api.rst (100%)
 rename {doc => packages/basemap/doc}/api/index.rst (100%)
 rename {doc => packages/basemap/doc}/conf.py (100%)
 rename {doc => packages/basemap/doc}/index.rst (100%)
 rename {doc => packages/basemap/doc}/make.py (100%)
 rename {doc => packages/basemap/doc}/matplotlibrc (100%)
 rename {doc => packages/basemap/doc}/users/aea.rst (100%)
 rename {doc => packages/basemap/doc}/users/aeqd.rst (100%)
 rename {doc => packages/basemap/doc}/users/cass.rst (100%)
 rename {doc => packages/basemap/doc}/users/cea.rst (100%)
 rename {doc => packages/basemap/doc}/users/cyl.rst (100%)
 rename {doc => packages/basemap/doc}/users/download.rst (100%)
 rename {doc => packages/basemap/doc}/users/eck4.rst (100%)
 rename {doc => packages/basemap/doc}/users/eqdc.rst (100%)
 rename {doc => packages/basemap/doc}/users/examples.rst (100%)
 rename {doc => packages/basemap/doc}/users/figures/aea.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/aeqd.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/aeqd_fulldisk.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/azeqd.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/background1.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/background2.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/background3.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/background4.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/background5.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/cass.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/cea.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/contour1.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/cyl.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/eck4.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/eqdc.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/gall.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/geos_full.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/geos_partial.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/gnomon.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/graticule.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/hammer.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/hurrtracks.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/kav7.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/laea.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/lcc.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/mbtfpq.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/merc.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/mill.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/moll.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/npaeqd.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/nplaea.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/npstere.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/nsper_full.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/nsper_partial.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/omerc.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/ortho_full.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/ortho_partial.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotargo.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotboulder.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotdaynight.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotetopo5.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotgreatcircle.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plothighsandlows.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotprecip.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotsst.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/plotwindvec.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/poly.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/robin.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/sinu.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/spaeqd.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/splaea.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/spstere.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/stere.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/tmerc.py (100%)
 rename {doc => packages/basemap/doc}/users/figures/vandg.py (100%)
 rename {doc => packages/basemap/doc}/users/gall.rst (100%)
 rename {doc => packages/basemap/doc}/users/geography.rst (100%)
 rename {doc => packages/basemap/doc}/users/geos.rst (100%)
 rename {doc => packages/basemap/doc}/users/gnomon.rst (100%)
 rename {doc => packages/basemap/doc}/users/graticule.rst (100%)
 rename {doc => packages/basemap/doc}/users/hammer.rst (100%)
 rename {doc => packages/basemap/doc}/users/index.rst (100%)
 rename {doc => packages/basemap/doc}/users/installing.rst (100%)
 rename {doc => packages/basemap/doc}/users/intro.rst (100%)
 rename {doc => packages/basemap/doc}/users/kav7.rst (100%)
 rename {doc => packages/basemap/doc}/users/laea.rst (100%)
 rename {doc => packages/basemap/doc}/users/lcc.rst (100%)
 rename {doc => packages/basemap/doc}/users/mapcoords.rst (100%)
 rename {doc => packages/basemap/doc}/users/mapsetup.rst (100%)
 rename {doc => packages/basemap/doc}/users/mbtfpq.rst (100%)
 rename {doc => packages/basemap/doc}/users/merc.rst (100%)
 rename {doc => packages/basemap/doc}/users/mill.rst (100%)
 rename {doc => packages/basemap/doc}/users/moll.rst (100%)
 rename {doc => packages/basemap/doc}/users/nsper.rst (100%)
 rename {doc => packages/basemap/doc}/users/omerc.rst (100%)
 rename {doc => packages/basemap/doc}/users/ortho.rst (100%)
 rename {doc => packages/basemap/doc}/users/paeqd.rst (100%)
 rename {doc => packages/basemap/doc}/users/plaea.rst (100%)
 rename {doc => packages/basemap/doc}/users/poly.rst (100%)
 rename {doc => packages/basemap/doc}/users/pstere.rst (100%)
 rename {doc => packages/basemap/doc}/users/robin.rst (100%)
 rename {doc => packages/basemap/doc}/users/sinu.rst (100%)
 rename {doc => packages/basemap/doc}/users/stere.rst (100%)
 rename {doc => packages/basemap/doc}/users/tmerc.rst (100%)
 rename {doc => packages/basemap/doc}/users/vandg.rst (100%)

diff --git a/doc/README.txt b/packages/basemap/doc/README.txt
similarity index 100%
rename from doc/README.txt
rename to packages/basemap/doc/README.txt
diff --git a/doc/api/basemap_api.rst b/packages/basemap/doc/api/basemap_api.rst
similarity index 100%
rename from doc/api/basemap_api.rst
rename to packages/basemap/doc/api/basemap_api.rst
diff --git a/doc/api/index.rst b/packages/basemap/doc/api/index.rst
similarity index 100%
rename from doc/api/index.rst
rename to packages/basemap/doc/api/index.rst
diff --git a/doc/conf.py b/packages/basemap/doc/conf.py
similarity index 100%
rename from doc/conf.py
rename to packages/basemap/doc/conf.py
diff --git a/doc/index.rst b/packages/basemap/doc/index.rst
similarity index 100%
rename from doc/index.rst
rename to packages/basemap/doc/index.rst
diff --git a/doc/make.py b/packages/basemap/doc/make.py
similarity index 100%
rename from doc/make.py
rename to packages/basemap/doc/make.py
diff --git a/doc/matplotlibrc b/packages/basemap/doc/matplotlibrc
similarity index 100%
rename from doc/matplotlibrc
rename to packages/basemap/doc/matplotlibrc
diff --git a/doc/users/aea.rst b/packages/basemap/doc/users/aea.rst
similarity index 100%
rename from doc/users/aea.rst
rename to packages/basemap/doc/users/aea.rst
diff --git a/doc/users/aeqd.rst b/packages/basemap/doc/users/aeqd.rst
similarity index 100%
rename from doc/users/aeqd.rst
rename to packages/basemap/doc/users/aeqd.rst
diff --git a/doc/users/cass.rst b/packages/basemap/doc/users/cass.rst
similarity index 100%
rename from doc/users/cass.rst
rename to packages/basemap/doc/users/cass.rst
diff --git a/doc/users/cea.rst b/packages/basemap/doc/users/cea.rst
similarity index 100%
rename from doc/users/cea.rst
rename to packages/basemap/doc/users/cea.rst
diff --git a/doc/users/cyl.rst b/packages/basemap/doc/users/cyl.rst
similarity index 100%
rename from doc/users/cyl.rst
rename to packages/basemap/doc/users/cyl.rst
diff --git a/doc/users/download.rst b/packages/basemap/doc/users/download.rst
similarity index 100%
rename from doc/users/download.rst
rename to packages/basemap/doc/users/download.rst
diff --git a/doc/users/eck4.rst b/packages/basemap/doc/users/eck4.rst
similarity index 100%
rename from doc/users/eck4.rst
rename to packages/basemap/doc/users/eck4.rst
diff --git a/doc/users/eqdc.rst b/packages/basemap/doc/users/eqdc.rst
similarity index 100%
rename from doc/users/eqdc.rst
rename to packages/basemap/doc/users/eqdc.rst
diff --git a/doc/users/examples.rst b/packages/basemap/doc/users/examples.rst
similarity index 100%
rename from doc/users/examples.rst
rename to packages/basemap/doc/users/examples.rst
diff --git a/doc/users/figures/aea.py b/packages/basemap/doc/users/figures/aea.py
similarity index 100%
rename from doc/users/figures/aea.py
rename to packages/basemap/doc/users/figures/aea.py
diff --git a/doc/users/figures/aeqd.py b/packages/basemap/doc/users/figures/aeqd.py
similarity index 100%
rename from doc/users/figures/aeqd.py
rename to packages/basemap/doc/users/figures/aeqd.py
diff --git a/doc/users/figures/aeqd_fulldisk.py b/packages/basemap/doc/users/figures/aeqd_fulldisk.py
similarity index 100%
rename from doc/users/figures/aeqd_fulldisk.py
rename to packages/basemap/doc/users/figures/aeqd_fulldisk.py
diff --git a/doc/users/figures/azeqd.py b/packages/basemap/doc/users/figures/azeqd.py
similarity index 100%
rename from doc/users/figures/azeqd.py
rename to packages/basemap/doc/users/figures/azeqd.py
diff --git a/doc/users/figures/background1.py b/packages/basemap/doc/users/figures/background1.py
similarity index 100%
rename from doc/users/figures/background1.py
rename to packages/basemap/doc/users/figures/background1.py
diff --git a/doc/users/figures/background2.py b/packages/basemap/doc/users/figures/background2.py
similarity index 100%
rename from doc/users/figures/background2.py
rename to packages/basemap/doc/users/figures/background2.py
diff --git a/doc/users/figures/background3.py b/packages/basemap/doc/users/figures/background3.py
similarity index 100%
rename from doc/users/figures/background3.py
rename to packages/basemap/doc/users/figures/background3.py
diff --git a/doc/users/figures/background4.py b/packages/basemap/doc/users/figures/background4.py
similarity index 100%
rename from doc/users/figures/background4.py
rename to packages/basemap/doc/users/figures/background4.py
diff --git a/doc/users/figures/background5.py b/packages/basemap/doc/users/figures/background5.py
similarity index 100%
rename from doc/users/figures/background5.py
rename to packages/basemap/doc/users/figures/background5.py
diff --git a/doc/users/figures/cass.py b/packages/basemap/doc/users/figures/cass.py
similarity index 100%
rename from doc/users/figures/cass.py
rename to packages/basemap/doc/users/figures/cass.py
diff --git a/doc/users/figures/cea.py b/packages/basemap/doc/users/figures/cea.py
similarity index 100%
rename from doc/users/figures/cea.py
rename to packages/basemap/doc/users/figures/cea.py
diff --git a/doc/users/figures/contour1.py b/packages/basemap/doc/users/figures/contour1.py
similarity index 100%
rename from doc/users/figures/contour1.py
rename to packages/basemap/doc/users/figures/contour1.py
diff --git a/doc/users/figures/cyl.py b/packages/basemap/doc/users/figures/cyl.py
similarity index 100%
rename from doc/users/figures/cyl.py
rename to packages/basemap/doc/users/figures/cyl.py
diff --git a/doc/users/figures/eck4.py b/packages/basemap/doc/users/figures/eck4.py
similarity index 100%
rename from doc/users/figures/eck4.py
rename to packages/basemap/doc/users/figures/eck4.py
diff --git a/doc/users/figures/eqdc.py b/packages/basemap/doc/users/figures/eqdc.py
similarity index 100%
rename from doc/users/figures/eqdc.py
rename to packages/basemap/doc/users/figures/eqdc.py
diff --git a/doc/users/figures/gall.py b/packages/basemap/doc/users/figures/gall.py
similarity index 100%
rename from doc/users/figures/gall.py
rename to packages/basemap/doc/users/figures/gall.py
diff --git a/doc/users/figures/geos_full.py b/packages/basemap/doc/users/figures/geos_full.py
similarity index 100%
rename from doc/users/figures/geos_full.py
rename to packages/basemap/doc/users/figures/geos_full.py
diff --git a/doc/users/figures/geos_partial.py b/packages/basemap/doc/users/figures/geos_partial.py
similarity index 100%
rename from doc/users/figures/geos_partial.py
rename to packages/basemap/doc/users/figures/geos_partial.py
diff --git a/doc/users/figures/gnomon.py b/packages/basemap/doc/users/figures/gnomon.py
similarity index 100%
rename from doc/users/figures/gnomon.py
rename to packages/basemap/doc/users/figures/gnomon.py
diff --git a/doc/users/figures/graticule.py b/packages/basemap/doc/users/figures/graticule.py
similarity index 100%
rename from doc/users/figures/graticule.py
rename to packages/basemap/doc/users/figures/graticule.py
diff --git a/doc/users/figures/hammer.py b/packages/basemap/doc/users/figures/hammer.py
similarity index 100%
rename from doc/users/figures/hammer.py
rename to packages/basemap/doc/users/figures/hammer.py
diff --git a/doc/users/figures/hurrtracks.py b/packages/basemap/doc/users/figures/hurrtracks.py
similarity index 100%
rename from doc/users/figures/hurrtracks.py
rename to packages/basemap/doc/users/figures/hurrtracks.py
diff --git a/doc/users/figures/kav7.py b/packages/basemap/doc/users/figures/kav7.py
similarity index 100%
rename from doc/users/figures/kav7.py
rename to packages/basemap/doc/users/figures/kav7.py
diff --git a/doc/users/figures/laea.py b/packages/basemap/doc/users/figures/laea.py
similarity index 100%
rename from doc/users/figures/laea.py
rename to packages/basemap/doc/users/figures/laea.py
diff --git a/doc/users/figures/lcc.py b/packages/basemap/doc/users/figures/lcc.py
similarity index 100%
rename from doc/users/figures/lcc.py
rename to packages/basemap/doc/users/figures/lcc.py
diff --git a/doc/users/figures/mbtfpq.py b/packages/basemap/doc/users/figures/mbtfpq.py
similarity index 100%
rename from doc/users/figures/mbtfpq.py
rename to packages/basemap/doc/users/figures/mbtfpq.py
diff --git a/doc/users/figures/merc.py b/packages/basemap/doc/users/figures/merc.py
similarity index 100%
rename from doc/users/figures/merc.py
rename to packages/basemap/doc/users/figures/merc.py
diff --git a/doc/users/figures/mill.py b/packages/basemap/doc/users/figures/mill.py
similarity index 100%
rename from doc/users/figures/mill.py
rename to packages/basemap/doc/users/figures/mill.py
diff --git a/doc/users/figures/moll.py b/packages/basemap/doc/users/figures/moll.py
similarity index 100%
rename from doc/users/figures/moll.py
rename to packages/basemap/doc/users/figures/moll.py
diff --git a/doc/users/figures/npaeqd.py b/packages/basemap/doc/users/figures/npaeqd.py
similarity index 100%
rename from doc/users/figures/npaeqd.py
rename to packages/basemap/doc/users/figures/npaeqd.py
diff --git a/doc/users/figures/nplaea.py b/packages/basemap/doc/users/figures/nplaea.py
similarity index 100%
rename from doc/users/figures/nplaea.py
rename to packages/basemap/doc/users/figures/nplaea.py
diff --git a/doc/users/figures/npstere.py b/packages/basemap/doc/users/figures/npstere.py
similarity index 100%
rename from doc/users/figures/npstere.py
rename to packages/basemap/doc/users/figures/npstere.py
diff --git a/doc/users/figures/nsper_full.py b/packages/basemap/doc/users/figures/nsper_full.py
similarity index 100%
rename from doc/users/figures/nsper_full.py
rename to packages/basemap/doc/users/figures/nsper_full.py
diff --git a/doc/users/figures/nsper_partial.py b/packages/basemap/doc/users/figures/nsper_partial.py
similarity index 100%
rename from doc/users/figures/nsper_partial.py
rename to packages/basemap/doc/users/figures/nsper_partial.py
diff --git a/doc/users/figures/omerc.py b/packages/basemap/doc/users/figures/omerc.py
similarity index 100%
rename from doc/users/figures/omerc.py
rename to packages/basemap/doc/users/figures/omerc.py
diff --git a/doc/users/figures/ortho_full.py b/packages/basemap/doc/users/figures/ortho_full.py
similarity index 100%
rename from doc/users/figures/ortho_full.py
rename to packages/basemap/doc/users/figures/ortho_full.py
diff --git a/doc/users/figures/ortho_partial.py b/packages/basemap/doc/users/figures/ortho_partial.py
similarity index 100%
rename from doc/users/figures/ortho_partial.py
rename to packages/basemap/doc/users/figures/ortho_partial.py
diff --git a/doc/users/figures/plotargo.py b/packages/basemap/doc/users/figures/plotargo.py
similarity index 100%
rename from doc/users/figures/plotargo.py
rename to packages/basemap/doc/users/figures/plotargo.py
diff --git a/doc/users/figures/plotboulder.py b/packages/basemap/doc/users/figures/plotboulder.py
similarity index 100%
rename from doc/users/figures/plotboulder.py
rename to packages/basemap/doc/users/figures/plotboulder.py
diff --git a/doc/users/figures/plotdaynight.py b/packages/basemap/doc/users/figures/plotdaynight.py
similarity index 100%
rename from doc/users/figures/plotdaynight.py
rename to packages/basemap/doc/users/figures/plotdaynight.py
diff --git a/doc/users/figures/plotetopo5.py b/packages/basemap/doc/users/figures/plotetopo5.py
similarity index 100%
rename from doc/users/figures/plotetopo5.py
rename to packages/basemap/doc/users/figures/plotetopo5.py
diff --git a/doc/users/figures/plotgreatcircle.py b/packages/basemap/doc/users/figures/plotgreatcircle.py
similarity index 100%
rename from doc/users/figures/plotgreatcircle.py
rename to packages/basemap/doc/users/figures/plotgreatcircle.py
diff --git a/doc/users/figures/plothighsandlows.py b/packages/basemap/doc/users/figures/plothighsandlows.py
similarity index 100%
rename from doc/users/figures/plothighsandlows.py
rename to packages/basemap/doc/users/figures/plothighsandlows.py
diff --git a/doc/users/figures/plotprecip.py b/packages/basemap/doc/users/figures/plotprecip.py
similarity index 100%
rename from doc/users/figures/plotprecip.py
rename to packages/basemap/doc/users/figures/plotprecip.py
diff --git a/doc/users/figures/plotsst.py b/packages/basemap/doc/users/figures/plotsst.py
similarity index 100%
rename from doc/users/figures/plotsst.py
rename to packages/basemap/doc/users/figures/plotsst.py
diff --git a/doc/users/figures/plotwindvec.py b/packages/basemap/doc/users/figures/plotwindvec.py
similarity index 100%
rename from doc/users/figures/plotwindvec.py
rename to packages/basemap/doc/users/figures/plotwindvec.py
diff --git a/doc/users/figures/poly.py b/packages/basemap/doc/users/figures/poly.py
similarity index 100%
rename from doc/users/figures/poly.py
rename to packages/basemap/doc/users/figures/poly.py
diff --git a/doc/users/figures/robin.py b/packages/basemap/doc/users/figures/robin.py
similarity index 100%
rename from doc/users/figures/robin.py
rename to packages/basemap/doc/users/figures/robin.py
diff --git a/doc/users/figures/sinu.py b/packages/basemap/doc/users/figures/sinu.py
similarity index 100%
rename from doc/users/figures/sinu.py
rename to packages/basemap/doc/users/figures/sinu.py
diff --git a/doc/users/figures/spaeqd.py b/packages/basemap/doc/users/figures/spaeqd.py
similarity index 100%
rename from doc/users/figures/spaeqd.py
rename to packages/basemap/doc/users/figures/spaeqd.py
diff --git a/doc/users/figures/splaea.py b/packages/basemap/doc/users/figures/splaea.py
similarity index 100%
rename from doc/users/figures/splaea.py
rename to packages/basemap/doc/users/figures/splaea.py
diff --git a/doc/users/figures/spstere.py b/packages/basemap/doc/users/figures/spstere.py
similarity index 100%
rename from doc/users/figures/spstere.py
rename to packages/basemap/doc/users/figures/spstere.py
diff --git a/doc/users/figures/stere.py b/packages/basemap/doc/users/figures/stere.py
similarity index 100%
rename from doc/users/figures/stere.py
rename to packages/basemap/doc/users/figures/stere.py
diff --git a/doc/users/figures/tmerc.py b/packages/basemap/doc/users/figures/tmerc.py
similarity index 100%
rename from doc/users/figures/tmerc.py
rename to packages/basemap/doc/users/figures/tmerc.py
diff --git a/doc/users/figures/vandg.py b/packages/basemap/doc/users/figures/vandg.py
similarity index 100%
rename from doc/users/figures/vandg.py
rename to packages/basemap/doc/users/figures/vandg.py
diff --git a/doc/users/gall.rst b/packages/basemap/doc/users/gall.rst
similarity index 100%
rename from doc/users/gall.rst
rename to packages/basemap/doc/users/gall.rst
diff --git a/doc/users/geography.rst b/packages/basemap/doc/users/geography.rst
similarity index 100%
rename from doc/users/geography.rst
rename to packages/basemap/doc/users/geography.rst
diff --git a/doc/users/geos.rst b/packages/basemap/doc/users/geos.rst
similarity index 100%
rename from doc/users/geos.rst
rename to packages/basemap/doc/users/geos.rst
diff --git a/doc/users/gnomon.rst b/packages/basemap/doc/users/gnomon.rst
similarity index 100%
rename from doc/users/gnomon.rst
rename to packages/basemap/doc/users/gnomon.rst
diff --git a/doc/users/graticule.rst b/packages/basemap/doc/users/graticule.rst
similarity index 100%
rename from doc/users/graticule.rst
rename to packages/basemap/doc/users/graticule.rst
diff --git a/doc/users/hammer.rst b/packages/basemap/doc/users/hammer.rst
similarity index 100%
rename from doc/users/hammer.rst
rename to packages/basemap/doc/users/hammer.rst
diff --git a/doc/users/index.rst b/packages/basemap/doc/users/index.rst
similarity index 100%
rename from doc/users/index.rst
rename to packages/basemap/doc/users/index.rst
diff --git a/doc/users/installing.rst b/packages/basemap/doc/users/installing.rst
similarity index 100%
rename from doc/users/installing.rst
rename to packages/basemap/doc/users/installing.rst
diff --git a/doc/users/intro.rst b/packages/basemap/doc/users/intro.rst
similarity index 100%
rename from doc/users/intro.rst
rename to packages/basemap/doc/users/intro.rst
diff --git a/doc/users/kav7.rst b/packages/basemap/doc/users/kav7.rst
similarity index 100%
rename from doc/users/kav7.rst
rename to packages/basemap/doc/users/kav7.rst
diff --git a/doc/users/laea.rst b/packages/basemap/doc/users/laea.rst
similarity index 100%
rename from doc/users/laea.rst
rename to packages/basemap/doc/users/laea.rst
diff --git a/doc/users/lcc.rst b/packages/basemap/doc/users/lcc.rst
similarity index 100%
rename from doc/users/lcc.rst
rename to packages/basemap/doc/users/lcc.rst
diff --git a/doc/users/mapcoords.rst b/packages/basemap/doc/users/mapcoords.rst
similarity index 100%
rename from doc/users/mapcoords.rst
rename to packages/basemap/doc/users/mapcoords.rst
diff --git a/doc/users/mapsetup.rst b/packages/basemap/doc/users/mapsetup.rst
similarity index 100%
rename from doc/users/mapsetup.rst
rename to packages/basemap/doc/users/mapsetup.rst
diff --git a/doc/users/mbtfpq.rst b/packages/basemap/doc/users/mbtfpq.rst
similarity index 100%
rename from doc/users/mbtfpq.rst
rename to packages/basemap/doc/users/mbtfpq.rst
diff --git a/doc/users/merc.rst b/packages/basemap/doc/users/merc.rst
similarity index 100%
rename from doc/users/merc.rst
rename to packages/basemap/doc/users/merc.rst
diff --git a/doc/users/mill.rst b/packages/basemap/doc/users/mill.rst
similarity index 100%
rename from doc/users/mill.rst
rename to packages/basemap/doc/users/mill.rst
diff --git a/doc/users/moll.rst b/packages/basemap/doc/users/moll.rst
similarity index 100%
rename from doc/users/moll.rst
rename to packages/basemap/doc/users/moll.rst
diff --git a/doc/users/nsper.rst b/packages/basemap/doc/users/nsper.rst
similarity index 100%
rename from doc/users/nsper.rst
rename to packages/basemap/doc/users/nsper.rst
diff --git a/doc/users/omerc.rst b/packages/basemap/doc/users/omerc.rst
similarity index 100%
rename from doc/users/omerc.rst
rename to packages/basemap/doc/users/omerc.rst
diff --git a/doc/users/ortho.rst b/packages/basemap/doc/users/ortho.rst
similarity index 100%
rename from doc/users/ortho.rst
rename to packages/basemap/doc/users/ortho.rst
diff --git a/doc/users/paeqd.rst b/packages/basemap/doc/users/paeqd.rst
similarity index 100%
rename from doc/users/paeqd.rst
rename to packages/basemap/doc/users/paeqd.rst
diff --git a/doc/users/plaea.rst b/packages/basemap/doc/users/plaea.rst
similarity index 100%
rename from doc/users/plaea.rst
rename to packages/basemap/doc/users/plaea.rst
diff --git a/doc/users/poly.rst b/packages/basemap/doc/users/poly.rst
similarity index 100%
rename from doc/users/poly.rst
rename to packages/basemap/doc/users/poly.rst
diff --git a/doc/users/pstere.rst b/packages/basemap/doc/users/pstere.rst
similarity index 100%
rename from doc/users/pstere.rst
rename to packages/basemap/doc/users/pstere.rst
diff --git a/doc/users/robin.rst b/packages/basemap/doc/users/robin.rst
similarity index 100%
rename from doc/users/robin.rst
rename to packages/basemap/doc/users/robin.rst
diff --git a/doc/users/sinu.rst b/packages/basemap/doc/users/sinu.rst
similarity index 100%
rename from doc/users/sinu.rst
rename to packages/basemap/doc/users/sinu.rst
diff --git a/doc/users/stere.rst b/packages/basemap/doc/users/stere.rst
similarity index 100%
rename from doc/users/stere.rst
rename to packages/basemap/doc/users/stere.rst
diff --git a/doc/users/tmerc.rst b/packages/basemap/doc/users/tmerc.rst
similarity index 100%
rename from doc/users/tmerc.rst
rename to packages/basemap/doc/users/tmerc.rst
diff --git a/doc/users/vandg.rst b/packages/basemap/doc/users/vandg.rst
similarity index 100%
rename from doc/users/vandg.rst
rename to packages/basemap/doc/users/vandg.rst

From dcd60fedb435daec72540ca0fffc1dc6b001a7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sat, 22 Jan 2022 00:48:35 +0100
Subject: [PATCH 18/21] Update CHANGELOG

---
 CHANGELOG.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782807346..a512a5f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,14 @@ since version 1.3.0.
 
 ## [Unreleased]
 
-## Changed
+### Added
+- Support for Python 3.10 (issues [#530] and [#531]).
+
+### Changed
 - Upgrade `numpy` upper pin to 1.23.
+- Upgrade `matplotlib` upper pin to 3.6.
 - Upgrade development requirements for Python 3.10.
+- Move `doc` folder into `packages/basemap`.
 
 ## [1.3.0] - 2021-12-28
 
@@ -836,6 +841,10 @@ since version 1.3.0.
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#531]:
+https://github.com/matplotlib/basemap/issues/531
+[#530]:
+https://github.com/matplotlib/basemap/issues/530
 [#526]:
 https://github.com/matplotlib/basemap/issues/526
 [#525]:

From ff650a15b4ab56d56780b45fc2ff3d72a568ed9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sat, 22 Jan 2022 00:55:24 +0100
Subject: [PATCH 19/21] Prepare CHANGELOG for release 1.3.1

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a512a5f02..73206a7c3 100644
--- a/CHANGELOG.md
+++ b/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]).
@@ -891,7 +891,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]:

From 59ffbf7e65600248cd3a36f7c1418f45daa2cf3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sat, 22 Jan 2022 01:00:47 +0100
Subject: [PATCH 20/21] Set version numbers for release 1.3.1

---
 packages/basemap/README.md                            | 4 ++--
 packages/basemap/setup.py                             | 2 +-
 packages/basemap/src/mpl_toolkits/basemap/__init__.py | 2 +-
 packages/basemap/src/mpl_toolkits/basemap/proj.py     | 2 +-
 packages/basemap_data/setup.py                        | 2 +-
 packages/basemap_data_hires/setup.py                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/basemap/README.md b/packages/basemap/README.md
index a40f86549..849836c85 100644
--- a/packages/basemap/README.md
+++ b/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
diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py
index f8e8eb41f..c4b6f4697 100644
--- a/packages/basemap/setup.py
+++ b/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":
diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
index 5ac9a0cc2..e103cbf48 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py
+++ b/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
diff --git a/packages/basemap/src/mpl_toolkits/basemap/proj.py b/packages/basemap/src/mpl_toolkits/basemap/proj.py
index 0f6fb2600..dc2c62abf 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/proj.py
+++ b/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.)
 
diff --git a/packages/basemap_data/setup.py b/packages/basemap_data/setup.py
index 60e053f3d..4674b6003 100644
--- a/packages/basemap_data/setup.py
+++ b/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":
diff --git a/packages/basemap_data_hires/setup.py b/packages/basemap_data_hires/setup.py
index 4697e669f..72f035c41 100644
--- a/packages/basemap_data_hires/setup.py
+++ b/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":

From 438dea73d1a786690120cddb3f80ea8c91628dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Sat, 22 Jan 2022 01:11:04 +0100
Subject: [PATCH 21/21] Fix error message about missing basemap-data-hires

---
 CHANGELOG.md                                          | 4 ++++
 packages/basemap/src/mpl_toolkits/basemap/__init__.py | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73206a7c3..362b8be7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
index e103cbf48..af999757e 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py
+++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
@@ -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: