Merge branch 'feature-py312' into develop

Author: molinav

.github/workflows/basemap-for-manylinux.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: checkout
@@ -131,7 +131,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: build-geos
@@ -158,37 +158,44 @@ jobs:
       -
         name: Build old numpy from source
         run: |
+          case "${{ matrix.arch }}" in
+              x64)  arch="x86_64" ;;
+              x86)  arch="i686"   ;;
+          esac
           case "${{ matrix.python-version }}" in
-              2.6|3.[23])      pkgvers=1.11.3;;
-              2.7|3.[456789])  pkgvers=1.16.6;;
-              3.10)            pkgvers=1.21.4;;
-              *)               pkgvers=1.23.3;;
+              2.6|3.[23])      pkgvers=1.11.3; tag=manylinux1 ;;
+              2.7|3.[456789])  pkgvers=1.16.6; tag=manylinux1 ;;
+              3.10)            pkgvers=1.21.4; tag=manylinux1 ;;
+              3.11)            pkgvers=1.23.3; tag=manylinux_2_17 ;;
+              *)               pkgvers=1.26.1; tag=manylinux_2_28 ;;
+          esac
+          case "${{ matrix.python-version }}" in
+              3.11|3.12)
+                  # Dirty solution to get NumPy headers for Python 3.11 and 3.12.
+                  kwds="--plat=${tag}_${arch}"
+                  pip download --no-deps ${kwds} "numpy==${pkgvers}"
+                  oldpkgfile=$(ls *.whl | head -n1)
+                  newpkgfile=$(echo "${oldpkgfile}" | sed "s/${tag}/linux/")
+                  mv "${oldpkgfile}" "${newpkgfile}"
+                  pip install "${newpkgfile}"
+                  rm "${newpkgfile}"
+              ;;
+              *)
+                  pip install "numpy == ${pkgvers}"
+              ;;
           esac
-          # Dirty solution to get NumPy headers for Python 3.11.
-          if [ "${{ matrix.python-version }}" = "3.11" ]; then
-              case "${{ matrix.arch }}" in
-                  x64)  kwds="--plat=manylinux_2_17_x86_64" ;;
-                  x86)  kwds="--plat=manylinux_2_17_i686"   ;;
-              esac
-              pip download --no-deps ${kwds} "numpy==${pkgvers}"
-              oldpkgfile=$(ls *.whl | head -n1)
-              newpkgfile=$(echo "${oldpkgfile}" | sed 's/manylinux_2_17/linux/')
-              mv "${oldpkgfile}" "${newpkgfile}"
-              pip install "${newpkgfile}"
-              rm "${newpkgfile}"
-          else
-              pip install "numpy == ${pkgvers}"
-          fi
       -
         name: Build wheel
         run: |
           sitepkgdir=$(pip show numpy 2>/dev/null | grep Location: | cut -d' ' -f2)
           export GEOS_DIR="${GITHUB_WORKSPACE}/${{ env.PKGDIR }}/extern"
           export NUMPY_INCLUDE_PATH=${sitepkgdir}/numpy/core/include
-          if [ "${{ matrix.python-version }}" = "3.11" ]; then
-              kwds="--no-build-isolation"
-              pip install setuptools wheel "cython >= 0.29, < 3.1"
-          fi
+          case "${{ matrix.python-version }}" in
+              3.11|3.12)
+                kwds="--no-build-isolation"
+                pip install setuptools wheel "cython >= 0.29, < 3.1"
+              ;;
+          esac
           cd ${{ env.PKGDIR }}
           python setup.py sdist
           pip wheel -w dist --no-deps ${kwds} dist/*.zip
@@ -205,7 +212,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -250,7 +257,16 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        exclude:
+          # Missing precompiled binaries for `numpy`, `matplotlib`, `pillow`
+          # and `lxml`.
+          - arch: "x64"
+            python-version: "3.12"
+          # Missing precompiled binaries for `numpy`, `matplotlib`, `pyproj`,
+          # `pillow` and `lxml`.
+          - arch: "x86"
+            python-version: "3.12"
       max-parallel: 3
       fail-fast: false
     needs: repair
@@ -347,7 +363,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test

.github/workflows/basemap-for-windows.yml

@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: checkout
@@ -147,7 +147,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: build-geos
@@ -176,7 +176,8 @@ jobs:
               "^2\.6|3\.[123]$"     { Set-Variable -Name "pkgvers" -Value "1.11.3" }
               "^2\.7|3\.[456789]$"  { Set-Variable -Name "pkgvers" -Value "1.16.6" }
               "^3\.10$"             { Set-Variable -Name "pkgvers" -Value "1.21.4" }
-              default               { Set-Variable -Name "pkgvers" -Value "1.23.3" }
+              "^3\.11$"             { Set-Variable -Name "pkgvers" -Value "1.23.3" }
+              default               { Set-Variable -Name "pkgvers" -Value "1.26.1" }
           }
           $env:SETUPTOOLS_USE_DISTUTILS = "stdlib"
           python -m pip install "numpy == ${pkgvers}"
@@ -221,7 +222,11 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        exclude:
+          # Missing precompiled binaries for `numpy` and `matplotlib`.
+          - arch: "x86"
+            python-version: "3.12"
       max-parallel: 3
       fail-fast: false
     needs: build
@@ -280,7 +285,7 @@ jobs:
         arch:
           ["x64", "x86"]
         python-version:
-          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 1
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test

CHANGELOG.md

@@ -13,6 +13,7 @@ https://semver.org/spec/v2.0.0.html
 ## [Unreleased]
 
 ### Added
+- Support for Python 3.12.
 - Optional argument `encoding_errors` for `Basemap.readshapefile` method
   (PR [#554] by @guziy, implements request [#552]).
 - Optional argument `cachedir` for `Basemap.arcgisimage` method to allow
@@ -22,18 +23,29 @@ https://semver.org/spec/v2.0.0.html
 - Upgrade bundled GEOS library to 3.6.5.
 - Create optional library requirements files:
   - `requirements-owslib.txt` for optional dependency `OWSLib`.
-    - Set `OWSLib` lower pin to 0.28.1 for Python 3.6+ due to
+    - Set `OWSLib` lower limit to 0.28.1 for Python 3.6+ due to
       vulnerability [CVE-2023-27476].
   - `requirements-pillow.txt` for optional dependency `pillow`:
-    - Upgrade `pillow` upper pin to 10.2.0.
+    - Upgrade `pillow` upper limit to 10.2.0.
 - Update library dependencies:
-  - Downgrade `pyproj` upper pin to 2.2.0 for Python 2.7.
+  - Upgrade upper limit for `numpy` to 1.27.0.
+  - Downgrade upper limit for `pyproj` to 2.2.0 for Python 2.7.
   - Set dependency on `packaging` as replacement for `distutils`.
 - Update build dependencies:
-  - Upgrade `Cython` upper pin to 3.1.
-- Update doc dependencies:
+  - Upgrade upper limit for `Cython` to 3.1.
+- Update doc dependencies and require at least Python 3.8 for them:
+  - Upgrade upper limit for `sphinx` to 7.2.
+  - Upgrade upper limit for `furo` to 2023.9.11.
   - Move dependency on `netCDF4` to `requirements-doc.txt`.
   - Set dependency on `cftime` explicitly in `requirements-doc.txt`.
+- Update lint dependencies:
+  - Downgrade upper limit for `flake8` to 6.2.
+  - Upgrade upper limit for `astropy` to 3.1.
+  - Upgrade lower limit for `pylint` to 3.1.
+- Update test dependencies:
+  - Upgrade upper limit for `pytest` to 7.5.
+  - Upgrade upper limit for `coverage` to 7.4.
+  - Upgrade upper limit for `pytest-cov` to 4.2.
 
 ### Fixed
 - Reimplement `matplotlib` version checks without using `distutils` and

packages/basemap/pyproject.toml

@@ -2,7 +2,8 @@
 requires = [
     'setuptools',
     'wheel',
-    'numpy == 1.23.3; python_version >= "3.11"',
+    'numpy == 1.26.1; python_version >= "3.12"',
+    'numpy == 1.23.3; python_version == "3.11"',
     '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")',

packages/basemap/requirements-doc.txt

@@ -1,5 +1,5 @@
-sphinx >= 5.3, < 6.3; python_version >= "3.6"
-furo >= 2022.4.7, < 2023.5.21; python_version >= "3.6"
+sphinx >= 5.3, < 7.2; python_version >= "3.8"
+furo >= 2022.4.7, < 2023.9.11; python_version >= "3.8"
 
 netCDF4 >= 1.5.6, < 1.7.0; python_version >= "3.6"
 cftime >= 1.4.0, < 1.7.0; python_version >= "3.6"

packages/basemap/requirements-lint.txt

@@ -5,13 +5,13 @@ flake8 >= 2.6, < 4.0; python_version == "2.7"
 flake8 >= 2.6, < 3.0; python_version == "3.2"
 flake8 >= 2.6, < 3.0; python_version == "3.3"
 flake8 >= 2.6, < 3.9; python_version == "3.4"
-flake8 >= 2.6, < 7.1; python_version >= "3.5"
+flake8 >= 2.6, < 6.2; python_version >= "3.5"
 
 astroid >= 1.6, < 2.0; python_version == "2.7"
 astroid >= 2.4, < 2.5; python_version == "3.5"
 astroid >= 2.5, < 2.7; python_version == "3.6"
-astroid >= 2.8, < 3.0; python_version >= "3.7"
+astroid >= 2.8, < 3.1; python_version >= "3.7"
 pylint >= 1.9, < 2.0; python_version == "2.7"
 pylint >= 2.6, < 2.7; python_version == "3.5"
 pylint >= 2.7, < 2.10; python_version == "3.6"
-pylint >= 2.11, < 3.0; python_version >= "3.7"
+pylint >= 2.11, < 3.1; python_version >= "3.7"

packages/basemap/requirements-test.txt

@@ -1,18 +1,23 @@
 unittest2; python_version <= "3.9"
 
-typing >= 3.5, < 3.11; python_version == "3.4"
-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.2; python_version == "3.5"
-pytest >= 6.2.5, < 6.3; python_version >= "3.6"
+pytest >= 3.2.0, < 3.3; python_version == "2.6"
+pytest >= 4.6.9, < 5.0; python_version == "2.7"
+pytest >= 2.9.0, < 3.0; python_version == "3.2"
+pytest >= 3.2.0, < 3.3; python_version == "3.3"
+pytest >= 4.6.9, < 5.0; python_version == "3.4"
+pytest >= 6.1.2, < 6.2; python_version == "3.5"
+pytest >= 6.2.5, < 7.5; python_version >= "3.6"
 
+coverage >= 4.5, < 5.0; python_version == "2.6"
+coverage >= 5.5, < 6.0; python_version == "2.7"
 coverage >= 3.7, < 4.0; python_version == "3.2"
+coverage >= 4.5, < 5.0; python_version == "3.3"
+coverage >= 4.5, < 5.0; python_version == "3.4"
+coverage >= 5.5, < 6.0; python_version == "3.5"
+coverage >= 5.5, < 7.4; python_version >= "3.6"
 pytest-cov >= 2.5, < 2.6; python_version == "2.6"
-pytest-cov >= 2.5, < 3.0; python_version == "2.7"
+pytest-cov >= 2.9, < 3.0; python_version == "2.7"
 pytest-cov >= 2.5, < 2.6; python_version == "3.2"
 pytest-cov >= 2.5, < 2.6; python_version == "3.3"
 pytest-cov >= 2.5, < 2.9; python_version == "3.4"
-pytest-cov >= 2.5, < 3.1; python_version >= "3.5"
+pytest-cov >= 2.9, < 4.2; python_version >= "3.5"

packages/basemap/requirements.txt

@@ -8,7 +8,7 @@ numpy >= 1.15, < 1.17; python_version == "3.4"
 numpy >= 1.16, < 1.19; python_version == "3.5"
 numpy >= 1.19, < 1.20; python_version == "3.6"
 numpy >= 1.21, < 1.22; python_version == "3.7"
-numpy >= 1.21, < 1.26; python_version >= "3.8"
+numpy >= 1.21, < 1.27; python_version >= "3.8"
 
 cycler < 0.11; python_version == "3.2"
 pyparsing >= 1.5, < 2.4.1; python_version == "2.6"

packages/basemap/setup.cfg

@@ -22,7 +22,11 @@ ignore =
 [tool:pytest]
 filterwarnings =
     error
-    ignore::DeprecationWarning:unittest2.compatibility:
+    # To be removed when replacing `unittest2`.
+    ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated:DeprecationWarning:unittest2.compatibility:143
+    # To be removed with `dateutil` release after 2.8.2.
+    # See: https://github.com/dateutil/dateutil/issues/1314
+    ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:dateutil.tz.tz:37
 
 [coverage:paths]
 source =

packages/basemap/setup.py

@@ -12,12 +12,11 @@
 from setuptools import setup
 from setuptools import find_packages
 from setuptools.command.sdist import sdist
-from setuptools.dist import Distribution
 from setuptools.extension import Extension
 
 try:
     import Cython
-    cython_major_version = int(Cython.__version__.split(".")[0])
+    cython_major_version = int(Cython.__version__.split(".", 1)[0])
 except ImportError:
     cython_major_version = 0
 
@@ -84,7 +83,7 @@ def get_geos_install_prefix():
     return None
 
 
-class basemap_sdist(sdist):
+class basemap_sdist(sdist):  # pylint: disable=invalid-name
     """Custom `sdist` so that it will not pack DLLs on Windows if present."""
 
     def run(self):
@@ -117,8 +116,8 @@ def run(self):
         import numpy
         include_dirs.append(numpy.get_include())
     except ImportError as err:
-        build_cmds = ("bdist_wheel", "build", "install")
-        if any(cmd in sys.argv[1:] for cmd in build_cmds):
+        cmds = ("bdist_wheel", "build", "install")
+        if any(cmd in sys.argv[1:] for cmd in cmds):
             warnings.warn("unable to locate NumPy headers", RuntimeWarning)
 
 # Define GEOS include, library and runtime dirs.
@@ -241,7 +240,7 @@ def run(self):
             ">=2.6",
             "!=3.0.*",
             "!=3.1.*",
-            "<3.12",
+            "<3.13",
         ]),
     "setup_requires":
         setup_requires,