From 0110485ac2c75da1dc98bd94411f17c3d379cb0d 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, 11 May 2022 23:04:37 +0200
Subject: [PATCH 01/16] Start next development cycle 1.3.3+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 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dd1513e2..5889abdfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ https://keepachangelog.com/en/1.0.0/
 https://semver.org/spec/v2.0.0.html
 
 
+## [Unreleased]
+
 ## [1.3.3] - 2022-05-11
 
 ### Changed
diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py
index 812fcc04c..7029eb8fe 100644
--- a/packages/basemap/setup.py
+++ b/packages/basemap/setup.py
@@ -172,7 +172,7 @@ def run(self):
     "name":
         "basemap",
     "version":
-        "1.3.3",
+        "1.3.3+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 c75a9db3a..77ff4d98a 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.3"
+__version__ = "1.3.3+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 c27597ef6..3a06e227a 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.3"
+__version__ = "1.3.3+dev"
 _dg2rad = math.radians(1.)
 _rad2dg = math.degrees(1.)
 

From f44f0c735028cbfc36ff858aaaf0f5b57776078c 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, 6 Aug 2022 12:00:09 +0200
Subject: [PATCH 02/16] Relax numpy build dependency

---
 CHANGELOG.md                    | 3 +++
 packages/basemap/pyproject.toml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5889abdfb..661444075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@ https://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+### Fixed
+- Relax `numpy` build dependency to ensure that builds work on MacOS.
+
 ## [1.3.3] - 2022-05-11
 
 ### Changed
diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml
index 74777ad04..4afc4d639 100644
--- a/packages/basemap/pyproject.toml
+++ b/packages/basemap/pyproject.toml
@@ -2,9 +2,9 @@
 requires = [
     'setuptools',
     'wheel',
-    'numpy == 1.21.4; python_version >= "3.10"',
-    'numpy == 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
-    'numpy == 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
+    'numpy >= 1.21.4; python_version >= "3.10"',
+    'numpy >= 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
+    'numpy >= 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
     'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"',
     'cython >= 0.26, < 0.27; python_version == "3.2"'
 ]

From a781572df7b29c265f4754a1d6c56ccf23d73441 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, 6 Aug 2022 12:19:44 +0200
Subject: [PATCH 03/16] Add numpy upper pins also in build-system requires

---
 packages/basemap/pyproject.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml
index 4afc4d639..d1007737e 100644
--- a/packages/basemap/pyproject.toml
+++ b/packages/basemap/pyproject.toml
@@ -2,9 +2,9 @@
 requires = [
     'setuptools',
     'wheel',
-    'numpy >= 1.21.4; python_version >= "3.10"',
-    'numpy >= 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
-    'numpy >= 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
+    'numpy >= 1.21.4, < 1.23; python_version >= "3.10"',
+    'numpy >= 1.16.6, < 1.23; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
+    'numpy >= 1.11.3, < 1.12; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
     'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"',
     'cython >= 0.26, < 0.27; python_version == "3.2"'
 ]

From 3aafe9df5eb71af37f273f72c1bd99aca31bf9eb 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, 6 Aug 2022 12:23:13 +0200
Subject: [PATCH 04/16] Update numpy upper pin to 1.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 661444075..2b886abef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@ https://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+### Changed
+- Upgrade `numpy` upper pin to 1.24.
+
 ### Fixed
 - Relax `numpy` build dependency to ensure that builds work on MacOS.
 
diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml
index d1007737e..1913df86f 100644
--- a/packages/basemap/pyproject.toml
+++ b/packages/basemap/pyproject.toml
@@ -2,8 +2,8 @@
 requires = [
     'setuptools',
     'wheel',
-    'numpy >= 1.21.4, < 1.23; python_version >= "3.10"',
-    'numpy >= 1.16.6, < 1.23; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
+    'numpy >= 1.21.4, < 1.24; python_version >= "3.10"',
+    'numpy >= 1.16.6, < 1.24; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
     'numpy >= 1.11.3, < 1.12; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
     'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"',
     'cython >= 0.26, < 0.27; python_version == "3.2"'
diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt
index 799f1f99d..4dbc84c1d 100644
--- a/packages/basemap/requirements.txt
+++ b/packages/basemap/requirements.txt
@@ -7,7 +7,7 @@ numpy >= 1.11, < 1.12; python_version == "3.3"
 numpy >= 1.15, < 1.17; python_version == "3.4"
 numpy >= 1.16, < 1.19; python_version == "3.5"
 numpy >= 1.16, < 1.20; python_version == "3.6"
-numpy >= 1.21, < 1.23; python_version >= "3.7"
+numpy >= 1.21, < 1.24; python_version >= "3.7"
 
 cycler < 0.11; python_version == "3.2"
 pyparsing >= 1.5, < 2.4.1; python_version == "2.6"

From 55112fb0a56277956e0ab7ab44e45d55103e8bf4 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, 6 Aug 2022 12:24:56 +0200
Subject: [PATCH 05/16] Update pyshp upper pin to 2.4

---
 CHANGELOG.md                      | 1 +
 packages/basemap/requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b886abef..efe29a002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ https://semver.org/spec/v2.0.0.html
 
 ### Changed
 - Upgrade `numpy` upper pin to 1.24.
+- Upgrade `pyshp` upper pin to 2.4.
 
 ### Fixed
 - Relax `numpy` build dependency to ensure that builds work on MacOS.
diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt
index 4dbc84c1d..db32abadd 100644
--- a/packages/basemap/requirements.txt
+++ b/packages/basemap/requirements.txt
@@ -27,4 +27,4 @@ pyproj >= 1.9.3, < 2.1.0; python_version == "3.4"
 pyproj >= 1.9.3, < 3.4.0; python_version >= "3.5"
 
 pyshp >= 1.2, < 2.0; python_version == "2.6"
-pyshp >= 1.2, < 2.2; python_version >= "2.7"
+pyshp >= 1.2, < 2.4; python_version >= "2.7"

From bd8b7bec081d20088a04b9e202150b56cc87e7c6 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, 6 Aug 2022 12:52:36 +0200
Subject: [PATCH 06/16] Refine numpy build dependency for MacOS in
 pyproject.toml

---
 packages/basemap/pyproject.toml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml
index 1913df86f..f9a33dfc0 100644
--- a/packages/basemap/pyproject.toml
+++ b/packages/basemap/pyproject.toml
@@ -2,9 +2,11 @@
 requires = [
     'setuptools',
     'wheel',
-    'numpy >= 1.21.4, < 1.24; python_version >= "3.10"',
-    'numpy >= 1.16.6, < 1.24; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.9")',
-    'numpy >= 1.11.3, < 1.12; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
+    'numpy == 1.21.4; python_version >= "3.10"',
+    'numpy == 1.21.4; sys_platform == "darwin" and (python_version >= "3.7" and python_version <= "3.9")',
+    'numpy == 1.16.6; sys_platform != "darwin" and (python_version >= "3.7" and python_version <= "3.9")',
+    'numpy == 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.6")',
+    'numpy == 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
     'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"',
     'cython >= 0.26, < 0.27; python_version == "3.2"'
 ]

From 77efe8b373f838ca0af32e1d439046fa82ccfa54 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, 6 Aug 2022 15:54:00 +0200
Subject: [PATCH 07/16] Upgrade doc requirements

---
 CHANGELOG.md                          | 2 ++
 packages/basemap/requirements-doc.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efe29a002..e759f70df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ https://semver.org/spec/v2.0.0.html
 ### Changed
 - Upgrade `numpy` upper pin to 1.24.
 - Upgrade `pyshp` upper pin to 2.4.
+- Upgrade `sphinx` upper pin to 5.0 and require at least Python 3.6 to
+  build the docs.
 
 ### Fixed
 - Relax `numpy` build dependency to ensure that builds work on MacOS.
diff --git a/packages/basemap/requirements-doc.txt b/packages/basemap/requirements-doc.txt
index b1779f107..cdea62cb0 100644
--- a/packages/basemap/requirements-doc.txt
+++ b/packages/basemap/requirements-doc.txt
@@ -1 +1 @@
-sphinx >= 3.0, < 3.4; python_version >= "3.5"
+sphinx >= 3.0, < 5.0; python_version >= "3.6"
\ No newline at end of file

From f370fd397e9c11c227cfc18691c415d9a702c254 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, 6 Aug 2022 15:56:39 +0200
Subject: [PATCH 08/16] Update CHANGELOG with closed issue

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e759f70df..927167a84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,8 @@ https://semver.org/spec/v2.0.0.html
   build the docs.
 
 ### Fixed
-- Relax `numpy` build dependency to ensure that builds work on MacOS.
+- Update `numpy` build dependency to ensure that builds also work on
+  MacOS (fixes issue [#547], thanks to @SongJaeIn for testing).
 
 ## [1.3.3] - 2022-05-11
 
@@ -913,6 +914,8 @@ https://semver.org/spec/v2.0.0.html
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#547]:
+https://github.com/matplotlib/basemap/issues/547
 [#541]:
 https://github.com/matplotlib/basemap/pull/541
 [#539]:

From 15bfd8dbfedd232335bdbacceab8de44a247bc0c 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, 7 Aug 2022 13:46:51 +0200
Subject: [PATCH 09/16] Remove wrong coordinates conversion in
 Basemap.arcgisimage

---
 packages/basemap/src/mpl_toolkits/basemap/__init__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
index 77ff4d98a..7a78717e4 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py
+++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
@@ -4284,9 +4284,6 @@ def arcgisimage(self,server='http://server.arcgisonline.com/ArcGIS',\
                 arcgisimage cannot handle images that cross
                 the dateline for cylindrical projections.""")
                 raise ValueError(msg)
-        if self.projection != 'cyl':
-            xmin = (180./np.pi)*xmin; xmax = (180./np.pi)*xmax
-            ymin = (180./np.pi)*ymin; ymax = (180./np.pi)*ymax
         # ypixels not given, find by scaling xpixels by the map aspect ratio.
         if ypixels is None:
             ypixels = int(self.aspect*xpixels)

From 4938c584db919b1d3db7a1436fed468b526b40e4 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, 7 Aug 2022 13:49:39 +0200
Subject: [PATCH 10/16] Fix default ArcGIS service in Basemap.arcgisimage

---
 packages/basemap/src/mpl_toolkits/basemap/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
index 7a78717e4..8f2a1369f 100644
--- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py
+++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
@@ -4215,7 +4215,7 @@ def warpimage(self,image="bluemarble",scale=None,**kwargs):
         return im
 
     def arcgisimage(self,server='http://server.arcgisonline.com/ArcGIS',\
-                 service='ESRI_Imagery_World_2D',xpixels=400,ypixels=None,\
+                 service='World_Imagery',xpixels=400,ypixels=None,\
                  dpi=96,verbose=False,**kwargs):
         """
         Retrieve an image using the ArcGIS Server REST API and display it on
@@ -4232,7 +4232,7 @@ def arcgisimage(self,server='http://server.arcgisonline.com/ArcGIS',\
         server           web map server URL (default
                          http://server.arcgisonline.com/ArcGIS).
         service          service (image type) hosted on server (default
-                         ESRI_Imagery_World_2D, which is NASA 'Blue Marble'
+                         'World_Imagery', which is NASA 'Blue Marble'
                          image).
         xpixels          requested number of image pixels in x-direction
                          (default 400).

From b7a59730ad2ca96d236d8120755d1a72da464ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 9 Aug 2022 18:22:22 +0200
Subject: [PATCH 11/16] Update numpy lower pins due to vulnerabilities

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 927167a84..3d22c6d48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,11 @@ https://semver.org/spec/v2.0.0.html
 ### Fixed
 - Update `numpy` build dependency to ensure that builds also work on
   MacOS (fixes issue [#547], thanks to @SongJaeIn for testing).
+- Enforce up-to-date `numpy` dependency when possible:
+  - Set `numpy >= 1.19` for Python == 3.6 due to `numpy` vulnerabilities
+    [CVE-2021-41495] and [CVE-2021-41496].
+  - Set `numpy >= 1.22` for Python >= 3.8 due to `numpy` vulnerability
+    [CVE-2021-34141].
 
 ## [1.3.3] - 2022-05-11
 
@@ -1022,8 +1027,14 @@ https://nvd.nist.gov/vuln/detail/CVE-2022-22817
 https://nvd.nist.gov/vuln/detail/CVE-2022-22816
 [CVE-2022-22815]:
 https://nvd.nist.gov/vuln/detail/CVE-2022-22815
+[CVE-2021-41496]:
+https://nvd.nist.gov/vuln/detail/CVE-2021-41496
+[CVE-2021-41495]:
+https://nvd.nist.gov/vuln/detail/CVE-2021-41495
 [CVE-2021-34552]:
 https://nvd.nist.gov/vuln/detail/CVE-2021-34552
+[CVE-2021-34141]:
+https://nvd.nist.gov/vuln/detail/CVE-2021-34141
 [CVE-2021-33430]:
 https://nvd.nist.gov/vuln/detail/CVE-2021-33430
 [CVE-2021-28678]:
diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt
index db32abadd..db0507765 100644
--- a/packages/basemap/requirements.txt
+++ b/packages/basemap/requirements.txt
@@ -6,8 +6,9 @@ numpy >= 1.11, < 1.12; python_version == "3.2"
 numpy >= 1.11, < 1.12; python_version == "3.3"
 numpy >= 1.15, < 1.17; python_version == "3.4"
 numpy >= 1.16, < 1.19; python_version == "3.5"
-numpy >= 1.16, < 1.20; python_version == "3.6"
-numpy >= 1.21, < 1.24; python_version >= "3.7"
+numpy >= 1.19, < 1.20; python_version == "3.6"
+numpy >= 1.21, < 1.22; python_version == "3.7"
+numpy >= 1.22, < 1.24; python_version >= "3.8"
 
 cycler < 0.11; python_version == "3.2"
 pyparsing >= 1.5, < 2.4.1; python_version == "2.6"

From 59dafcba9224d7c18a6620d0a9fe29814539e2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 9 Aug 2022 18:29:01 +0200
Subject: [PATCH 12/16] Update pillow lower pins due to vulnerabilities

---
 CHANGELOG.md                           | 5 +++++
 packages/basemap/requirements-test.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d22c6d48..8fd738abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ https://semver.org/spec/v2.0.0.html
     [CVE-2021-41495] and [CVE-2021-41496].
   - Set `numpy >= 1.22` for Python >= 3.8 due to `numpy` vulnerability
     [CVE-2021-34141].
+- Enforce up-to-date `pillow` dependency when possible:
+  - Set `pillow >= 9.0.1` for Python >= 3.7 due to `pillow`
+    vulnerability [CVE-2022-24303].
 
 ## [1.3.3] - 2022-05-11
 
@@ -1021,6 +1024,8 @@ https://github.com/matplotlib/basemap/compare/v1.0.3rel...v1.0.4rel
 [1.0.3]:
 https://github.com/matplotlib/basemap/tree/v1.0.3rel
 
+[CVE-2022-24303]:
+https://nvd.nist.gov/vuln/detail/CVE-2022-24303
 [CVE-2022-22817]:
 https://nvd.nist.gov/vuln/detail/CVE-2022-22817
 [CVE-2022-22816]:
diff --git a/packages/basemap/requirements-test.txt b/packages/basemap/requirements-test.txt
index 1033dade4..6d37070de 100644
--- a/packages/basemap/requirements-test.txt
+++ b/packages/basemap/requirements-test.txt
@@ -28,4 +28,4 @@ pillow >= 4.3.0, < 5.0.0; python_version == "3.3"
 pillow >= 5.4.0, < 6.0.0; python_version == "3.4"
 pillow >= 7.1.0, < 8.0.0; python_version == "3.5"
 pillow >= 8.3.2, < 9.0.0; python_version == "3.6"
-pillow >= 9.0.0, < 10.0.0; python_version >= "3.7"
+pillow >= 9.0.1, < 10.0.0; python_version >= "3.7"

From 620398a7e125c79145a2bf00e060baaf70ee399c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 9 Aug 2022 18:30:16 +0200
Subject: [PATCH 13/16] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fd738abe..f062a0c52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ https://semver.org/spec/v2.0.0.html
 ### Fixed
 - Update `numpy` build dependency to ensure that builds also work on
   MacOS (fixes issue [#547], thanks to @SongJaeIn for testing).
+- Fix broken implementation of `Basemap.arcgisimage` (PR [#548], solves
+  issue [#546]).
 - Enforce up-to-date `numpy` dependency when possible:
   - Set `numpy >= 1.19` for Python == 3.6 due to `numpy` vulnerabilities
     [CVE-2021-41495] and [CVE-2021-41496].
@@ -922,8 +924,12 @@ https://semver.org/spec/v2.0.0.html
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#548]:
+https://github.com/matplotlib/basemap/pull/548
 [#547]:
 https://github.com/matplotlib/basemap/issues/547
+[#546]:
+https://github.com/matplotlib/basemap/issues/546
 [#541]:
 https://github.com/matplotlib/basemap/pull/541
 [#539]:

From 85c50e67d42b3df08bb27ce23b100ef3ad8b284d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 9 Aug 2022 23:56:17 +0200
Subject: [PATCH 14/16] Update manylinux action to compile NumPy on Py38/Py39
 x86

---
 .github/workflows/basemap-for-manylinux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index 7281d3bdc..7aeb61423 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -265,7 +265,7 @@ jobs:
           apt-get update
           apt-get install -y gcc g++ make
           pip install "numpy < 1.21.5"
-        if: matrix.arch == 'x86' && matrix.python-version == '3.10'
+        if: matrix.arch == 'x86' && (matrix.python-version >= '3.8' || matrix.python-version >= '3.10')
       -
         name: Install package
         run: |

From 1f9a8815988a69199ca6863a927fe05a1d142e76 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, 10 Aug 2022 09:17:44 +0200
Subject: [PATCH 15/16] Update numpy upper pin in manylinux-x86 test job step

---
 .github/workflows/basemap-for-manylinux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
index 7aeb61423..f66b31b5e 100644
--- a/.github/workflows/basemap-for-manylinux.yml
+++ b/.github/workflows/basemap-for-manylinux.yml
@@ -264,7 +264,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y gcc g++ make
-          pip install "numpy < 1.21.5"
+          pip install "numpy < 1.24"
         if: matrix.arch == 'x86' && (matrix.python-version >= '3.8' || matrix.python-version >= '3.10')
       -
         name: Install package

From a49fb105de728ddfaee5a836e9ee3ae1e1a65772 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, 10 Aug 2022 16:38:11 +0200
Subject: [PATCH 16/16] Prepare for hotfix 1.3.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f062a0c52..8a6e9b9e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ https://keepachangelog.com/en/1.0.0/
 https://semver.org/spec/v2.0.0.html
 
 
-## [Unreleased]
+## [1.3.4] - 2022-08-10
 
 ### Changed
 - Upgrade `numpy` upper pin to 1.24.
@@ -1002,7 +1002,9 @@ https://github.com/matplotlib/basemap/issues/228
 https://github.com/matplotlib/basemap/issues/179
 
 [Unreleased]:
-https://github.com/matplotlib/basemap/compare/v1.3.3...develop
+https://github.com/matplotlib/basemap/compare/v1.3.4...develop
+[1.3.4]:
+https://github.com/matplotlib/basemap/compare/v1.3.3...v1.3.4
 [1.3.3]:
 https://github.com/matplotlib/basemap/compare/v1.3.2...v1.3.3
 [1.3.2]:
diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py
index 7029eb8fe..19588efe7 100644
--- a/packages/basemap/setup.py
+++ b/packages/basemap/setup.py
@@ -172,7 +172,7 @@ def run(self):
     "name":
         "basemap",
     "version":
-        "1.3.3+dev",
+        "1.3.4",
     "license":
         "MIT",
     "description":
diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
index 8f2a1369f..bdacd1c96 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.3+dev"
+__version__ = "1.3.4"
 
 # 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 3a06e227a..047b5183a 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.3+dev"
+__version__ = "1.3.4"
 _dg2rad = math.radians(1.)
 _rad2dg = math.degrees(1.)