Fix numpy and matplotlib dependency versions

Author: molinav

.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}

.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}"

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

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"