Merge branch 'release-2.0.0' into develop

Author: molinav

CHANGELOG.md

@@ -10,7 +10,7 @@ https://keepachangelog.com/en/1.0.0/
 https://semver.org/spec/v2.0.0.html
 
 
-## [Unreleased]
+## [2.0.0] - 2025-06-13
 
 ### Added
 - Python 3.13 support (PR [#619], solves issue [#608]).
@@ -29,9 +29,9 @@ https://semver.org/spec/v2.0.0.html
   - The `examples` folder is moved inside the `doc` folder.
 - **BREAKING CHANGE**: Migrate `basemap` libraries to use implicit
   namespace packages (PR [#576] by @ksunden).
-- Migrate workflows to use `cibuildwheel` (PRs [#614], [#618], [#622]
-  and [#623] by @cvanelteren and PR [#621], solves GitHub artifact
-  actions v1 sunset).
+- Migrate GitHub CI workflows to use `cibuildwheel` (PRs [#614], [#618],
+  [#622] and [#623] by @cvanelteren and PR [#621], solves GitHub
+  artifact actions v1 sunset issue).
 - Update library dependencies:
   - Upgrade lower limit for `basemap_data` to 2.0.
   - Upgrade upper limit for `basemap_data` to 3.0.
@@ -1364,7 +1364,9 @@ https://github.com/matplotlib/basemap/issues/228
 https://github.com/matplotlib/basemap/issues/179
 
 [Unreleased]:
-https://github.com/matplotlib/basemap/compare/v1.4.1...develop
+https://github.com/matplotlib/basemap/compare/v2.0.0...develop
+[2.0.0]:
+https://github.com/matplotlib/basemap/compare/v1.4.1...v2.0.0
 [1.4.1]:
 https://github.com/matplotlib/basemap/compare/v1.4.0...v1.4.1
 [1.4.0]:

README.md

@@ -11,7 +11,7 @@ on PyPI and can be installed with [`pip`]:
 python -m pip install basemap
 ```
 
-For specific details on how to install `basemap` through `conda` or
+For specific details on how to install [`basemap`] through [`conda`] or
 from source, please refer to the [`basemap` installation instructions]
 in the documentation.
 
@@ -74,6 +74,9 @@ polygons (this is illustrated in the [`ortho_demo.py`] example).
 
 [`pip`]:
 https://pip.pypa.io/
+[`conda`]:
+https://github.com/conda/conda
+
 [`matplotlib`]:
 https://matplotlib.org/
 [`basemap`]:

data/basemap_data/README.md

@@ -8,7 +8,7 @@ required by [`basemap`] to work.
 
 ## Installation
 
-The package is available in PyPI and can be installed with [`pip`]:
+The package is available on PyPI and can be installed with [`pip`]:
 ```python
 python -m pip install basemap-data
 ```
@@ -17,8 +17,8 @@ python -m pip install basemap-data
 
 The land-sea mask, coastline, lake, river and political boundary data
 are extracted from the [GSHHG] datasets (version 2.3.6) using [GMT]
-(5.x series) and are included under the terms of the [LGPLv3+] license
-(see [`COPYING`] and [`COPYING.LESSER`]).
+(5.x series) and are included under the terms of the [LGPL-3.0-or-later]
+license (see [`COPYING`] and [`COPYING.LESSER`]).
 
 The other files are included under the terms of the [MIT] license. See
 [`LICENSE.epsg`] for the EPSG file (taken from the PROJ.4 package) and
@@ -37,7 +37,7 @@ https://www.soest.hawaii.edu/pwessel/gshhg
 [GMT]:
 https://www.generic-mapping-tools.org/
 
-[LGPLv3+]:
+[LGPL-3.0-or-later]:
 https://spdx.org/licenses/LGPL-3.0-or-later.html
 [MIT]:
 https://spdx.org/licenses/MIT.html

data/basemap_data/setup.py

@@ -85,11 +85,11 @@ def get_content(name, splitlines=False):
     "author_email":
         "[email protected]",
     "maintainer":
-        "Víctor Molina García",
+        "The Matplotlib development team",
     "maintainer_email":
-        "molinav@users.noreply.github.com",
+        "matplotlib-users@python.org",
     "license":
-        "GNU Lesser General Public License v3 or later (LGPLv3+)",
+        "LGPL-3.0-or-later",
     "license_files": [
         "COPYING",
         "COPYING.LESSER",

data/basemap_data_hires/README.md

@@ -8,7 +8,7 @@ data assets.
 
 ## Installation
 
-The package is available in PyPI and can be installed with [`pip`]:
+The package is available on PyPI and can be installed with [`pip`]:
 ```python
 python -m pip install basemap-data-hires
 ```
@@ -17,8 +17,8 @@ python -m pip install basemap-data-hires
 
 The land-sea mask, coastline, lake, river and political boundary data
 are extracted from the [GSHHG] datasets (version 2.3.6) using [GMT]
-(5.x series) and are included under the terms of the [LGPLv3+] license
-(see [`COPYING`] and [`COPYING.LESSER`]).
+(5.x series) and are included under the terms of the [LGPL-3.0-or-later]
+license (see [`COPYING`] and [`COPYING.LESSER`]).
 
 
 [`matplotlib`]:
@@ -33,7 +33,7 @@ https://www.soest.hawaii.edu/pwessel/gshhg
 [GMT]:
 https://www.generic-mapping-tools.org/
 
-[LGPLv3+]:
+[LGPL-3.0-or-later]:
 https://spdx.org/licenses/LGPL-3.0-or-later.html
 [`COPYING`]:
 https://github.com/matplotlib/basemap/blob/v2.0.0/data/basemap_data_hires/COPYING

data/basemap_data_hires/setup.py

@@ -63,11 +63,11 @@ def get_content(name, splitlines=False):
     "author_email":
         "[email protected]",
     "maintainer":
-        "Víctor Molina García",
+        "The Matplotlib development team",
     "maintainer_email":
-        "molinav@users.noreply.github.com",
+        "matplotlib-users@python.org",
     "license":
-        "GNU Lesser General Public License v3 or later (LGPLv3+)",
+        "LGPL-3.0-or-later",
     "license_files": [
         "COPYING",
         "COPYING.LESSER",

setup.py

@@ -174,9 +174,9 @@ def run(self):
     "author_email":
         "[email protected]",
     "maintainer":
-        "Víctor Molina García",
+        "The Matplotlib development team",
     "maintainer_email":
-        "molinav@users.noreply.github.com",
+        "matplotlib-users@python.org",
     "license":
         "MIT",
     "license_files": [

src/_geoslib.pyx

@@ -2,7 +2,7 @@ import sys
 import numpy
 cimport numpy as cnp
 
-__version__ = "2.0.0.dev0"
+__version__ = "2.0.0"
 
 
 # Need some Python C-API functions for strings.

src/mpl_toolkits/basemap/__init__.py

@@ -48,7 +48,7 @@
 from . proj import Proj
 
 
-__version__ = "2.0.0.dev0"
+__version__ = "2.0.0"
 
 # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
 # check to see if environment variable BASEMAPDATA set to a directory,