Merge branch 'hotfix-1.4.1' into develop

matplotlib · Feb 15, 2024 · 6a7eba0 · 6a7eba0
2 parents 44b5e78 + 01b2218
commit 6a7eba0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
@@ -69,7 +69,7 @@ jobs:
       matrix:
         python-version:
           ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
-           "3.9", "3.10", "3.11"]
+           "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: build

diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
@@ -69,7 +69,7 @@ jobs:
       matrix:
         python-version:
           ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
-           "3.9", "3.10", "3.11"]
+           "3.9", "3.10", "3.11", "3.12"]
       max-parallel: 3
       fail-fast: false
     needs: build

diff --git 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.4.1] - 2024-02-15
 
 ### Changed
 - Update workflow actions to use NodeJS 20:
@@ -1252,7 +1252,9 @@ https://github.com/matplotlib/basemap/issues/228
 https://github.com/matplotlib/basemap/issues/179
 
 [Unreleased]:
-https://github.com/matplotlib/basemap/compare/v1.4.0...develop
+https://github.com/matplotlib/basemap/compare/v1.4.1...develop
+[1.4.1]:
+https://github.com/matplotlib/basemap/compare/v1.4.0...v1.4.1
 [1.4.0]:
 https://github.com/matplotlib/basemap/compare/v1.3.9...v1.4.0
 [1.3.9]:

diff --git 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.4.0/packages/basemap/LICENSE
+https://github.com/matplotlib/basemap/blob/v1.4.1/packages/basemap/LICENSE
 [`LICENSE.geos`]:
-https://github.com/matplotlib/basemap/blob/v1.4.0/packages/basemap/LICENSE.geos
+https://github.com/matplotlib/basemap/blob/v1.4.1/packages/basemap/LICENSE.geos
diff --git a/packages/basemap/requirements-doc.txt b/packages/basemap/requirements-doc.txt
@@ -2,5 +2,5 @@ sphinx >= 5.3, < 7.2; python_version >= "3.8"
 furo >= 2022.4.7, < 2023.9.11; python_version >= "3.8"
 
 scipy >= 1.2, < 1.12; python_version >= "3.5"
-netCDF4 >= 1.5.6, < 1.7.0; python_version >= "3.6"
 cftime >= 1.4.0, < 1.7.0; python_version >= "3.6"
+netCDF4 >= 1.5.6, < 1.7.0; python_version >= "3.6"
diff --git a/packages/basemap/src/_geoslib.pyx b/packages/basemap/src/_geoslib.pyx
@@ -2,7 +2,7 @@ import sys
 import numpy
 cimport numpy as cnp
 
-__version__ = "1.5.0-dev"
+__version__ = "1.4.1"
 
 
 # Need some Python C-API functions for strings.

diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py
@@ -48,7 +48,7 @@
 from . proj import Proj
 
 
-__version__ = "1.5.0-dev"
+__version__ = "1.4.1"
 
 # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
 # check to see if environment variable BASEMAPDATA set to a directory,