Merge branch 'release-1.3.0' into develop

Author: molinav

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

@@ -300,7 +300,6 @@ jobs:
       -
         name: Install package
         run: |
-          pip install --prefer-binary "basemap-data == 1.3.0rc1"
           pip install --prefer-binary ${{ env.PKGDIR }}/dist/*-manylinux1*.whl
       -
         name: Test package

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

@@ -218,7 +218,6 @@ jobs:
       -
         name: Install package
         run: |
-          pip install --prefer-binary "basemap-data == 1.3.0rc1"
           pip install --prefer-binary (Get-Item ${{ env.PKGDIR }}/dist/*-win*.whl)
       -
         name: Test package

CHANGELOG.md

@@ -5,7 +5,38 @@ is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and the
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 since version 1.3.0.
 
-## [Unreleased]
+## [1.3.0] - 2020-12-28
+
+### Added
+- Precompiled binary wheels available in PyPI.
+- Complete workflow to build the project wheels for Windows and GNU/Linux
+  using GitHub Actions.
+
+### Changed
+- Reorganise the package structure. In summary, the former `basemap` package
+  is split in three:
+  - `basemap` itself contains the Python modules.
+  - `basemap-data` contains the mandatory data assets required by `basemap`
+    to provide minimal functionality.
+  - `basemap-data-hires` contains the high-resolution data assets.
+- Upgrade default GEOS library dependency to 3.5.1.
+- Update and clarify licenses. In summary:
+  - `basemap`: MIT license.
+    - GEOS bundled dynamic library is under the LGPL-2.1-only license.
+  - `basemap-data`: LGPL-3.0-or-later.
+    - The EPSG file and the JPG images are also under the MIT license.
+  - `basemap-data-hires`: LGPL-3.0-or-later.
+
+### Fixed
+- Fix `Basemap.pcolormesh` for `"ortho"` projection (PR [#476]).
+- Fix `Basemap.arcgisimage` for cylindrical coordinates (PR [#505]).
+- Force `setup.py` to cythonize `_geoslib.pyx` at compile time (issues [#518]
+  and [#521]).
+
+### Removed
+- Bundled GEOS source code. The same source code can be downloaded using the
+  `GeosLibrary` class in `utils`.
+- Precompiled `_geoslib.c` file.
 
 ## [1.2.2] - 2020-08-04
 
@@ -791,8 +822,19 @@ since version 1.3.0.
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#521]:
+https://github.com/matplotlib/basemap/issues/521
+[#518]:
+https://github.com/matplotlib/basemap/issues/518
+[#505]:
+https://github.com/matplotlib/basemap/pull/505
+[#476]:
+https://github.com/matplotlib/basemap/pull/476
+
 [Unreleased]:
-https://github.com/matplotlib/basemap/compare/v1.2.2rel...develop
+https://github.com/matplotlib/basemap/compare/v1.3.0...develop
+[1.3.0]:
+https://github.com/matplotlib/basemap/compare/v1.2.2rel...v1.3.0
 [1.2.2]:
 https://github.com/matplotlib/basemap/compare/v1.2.1rel...v1.2.2rel
 [1.2.1]:

README.md

@@ -44,8 +44,8 @@ python -m pip install basemap
 Otherwise, you will need to install `basemap` from source as follows:
 
 1. Install pre-requisite Python modules:
-   - [cython](https://github.com/cython/cython).
-   - [numpy](https://github.com/numpy/numpy).
+   - [cython](https://github.com/cython/cython)
+   - [numpy](https://github.com/numpy/numpy)
 
 2. Download the `basemap` source code and move to the `packages/basemap`
    folder:

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.3.0rc1/packages/basemap/LICENSE
+https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap/LICENSE
 [`LICENSE.geos`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0rc1/packages/basemap/LICENSE.geos
+https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap/LICENSE.geos

packages/basemap/requirements.txt

@@ -1,4 +1,4 @@
-basemap_data > 1.2, < 1.4
+basemap_data >= 1.3, < 1.4
 
 six >= 1.10, < 1.16
 

packages/basemap/setup.py

@@ -166,13 +166,11 @@ def _default_to_zip(self):
         item.replace(marker, "") for item in install_requires
         if item.endswith(marker) or "python_version" not in item]
 
-# To create the source .tar.gz file:  python setup.py sdist
-# To create the universal wheel file: python setup.py bdist_wheel --universal
 setup(**{
     "name":
         "basemap",
     "version":
-        "1.3.0rc1+dev",
+        "1.3.0",
     "license":
         "MIT",
     "description":

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.0rc1+dev'
+__version__ = '1.3.0'
 
 # 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

packages/basemap/src/mpl_toolkits/basemap/proj.py

@@ -10,7 +10,7 @@
     # as textwrap.dedent.
     from matplotlib.cbook import dedent
 
-__version__ = '1.3.0rc1+dev'
+__version__ = '1.3.0'
 _dg2rad = math.radians(1.)
 _rad2dg = math.degrees(1.)
 

packages/basemap_data/README.md

@@ -43,10 +43,10 @@ https://spdx.org/licenses/LGPL-3.0-or-later.html
 https://spdx.org/licenses/MIT.html
 
 [`COPYING`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0rc1/packages/basemap_data/COPYING
+https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap_data/COPYING
 [`COPYING.LESSER`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0rc1/packages/basemap_data/COPYING.LESSER
+https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap_data/COPYING.LESSER
 [`LICENSE.epsg`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0rc1/packages/basemap_data/LICENSE.epsg
+https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap_data/LICENSE.epsg
 [`LICENSE.mit`]:
-https://github.com/matplotlib/basemap/blob/v1.3.0rc1/packages/basemap_data/LICENSE.mit
+https://github.com/matplotlib/basemap/blob/v1.3.0/packages/basemap_data/LICENSE.mit