Merge branch 'hotfix-1.3.5'

matplotlib · Oct 25, 2022 · f37aed3 · f37aed3
2 parents 41cfd4f + a8c0e86
commit f37aed3
Show file tree

Hide file tree

Showing 12 changed files with 487 additions and 369 deletions.
diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
@@ -2,6 +2,8 @@ name: basemap-data-hires
 
 env:
  PKGDIR: "packages/basemap_data_hires"
+ PYTHONWARNINGS: "ignore:DEPRECATION"
+ PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
  push:
@@ -21,7 +23,7 @@ jobs:
  steps:
  -
  name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  -
  name: Upload checkout
  uses: actions/upload-artifact@v1

diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
@@ -2,6 +2,8 @@ name: basemap-data
 
 env:
  PKGDIR: "packages/basemap_data"
+ PYTHONWARNINGS: "ignore:DEPRECATION"
+ PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
  push:
@@ -21,7 +23,7 @@ jobs:
  steps:
  -
  name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  -
  name: Upload checkout
  uses: actions/upload-artifact@v1

diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml
@@ -2,6 +2,8 @@ name: basemap-for-manylinux
 
 env:
  PKGDIR: "packages/basemap"
+ PYTHONWARNINGS: "ignore:DEPRECATION"
+ PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
  push:
@@ -21,7 +23,7 @@ jobs:
  steps:
  -
  name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  -
  name: Upload checkout
  uses: actions/upload-artifact@v1

diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
@@ -2,6 +2,8 @@ name: basemap-for-windows
 
 env:
  PKGDIR: "packages/basemap"
+ PYTHONWARNINGS: "ignore:DEPRECATION"
+ PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 on:
  push:
@@ -21,7 +23,7 @@ jobs:
  steps:
  -
  name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  -
  name: Upload checkout
  uses: actions/upload-artifact@v1
@@ -47,7 +49,7 @@ jobs:
  path: .
  -
  name: Set Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  architecture: ${{ matrix.arch }}
  python-version: ${{ matrix.python-version }}
@@ -85,23 +87,10 @@ jobs:
  build-geos:
  strategy:
  matrix:
- include:
- - 
- arch: "x64"
- msvc-toolset: "14.16"
- cmake-version: "3.14.7"
- - 
- arch: "x86"
- msvc-toolset: "14.16"
- cmake-version: "3.13.2"
- - 
- arch: "x64"
- msvc-toolset: "9.0"
- cmake-version: "3.14.7"
- - 
- arch: "x86"
- msvc-toolset: "9.0"
- cmake-version: "3.13.2"
+ arch:
+ ["x64", "x86"]
+ msvc-toolset:
+ ["9.0", "14.16"]
  max-parallel: 4
  fail-fast: false
  needs: lint
@@ -121,12 +110,12 @@ jobs:
  version: ${{ matrix.msvc-toolset }}
  -
  name: Set CMake
- uses: jwlawson/actions-setup-cmake@v1.9
+ uses: jwlawson/actions-setup-cmake@v1.13
  with:
- cmake-version: ${{ matrix.cmake-version }}
+ cmake-version: "3.14.7"
  -
  name: Set Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  architecture: ${{ matrix.arch }}
  python-version: "3.6"
@@ -176,7 +165,7 @@ jobs:
  version: ${{ env.msvc-toolset }}
  -
  name: Set Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  architecture: ${{ matrix.arch }}
  python-version: ${{ matrix.python-version }}
@@ -229,7 +218,7 @@ jobs:
  steps:
  -
  name: Set Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  architecture: ${{ matrix.arch }}
  python-version: ${{ matrix.python-version }}
@@ -264,7 +253,7 @@ jobs:
  steps:
  -
  name: Set Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  architecture: ${{ matrix.arch }}
  python-version: ${{ matrix.python-version }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,16 @@ https://keepachangelog.com/en/1.0.0/
 https://semver.org/spec/v2.0.0.html
 
 
+## [1.3.5] - 2022-10-25
+
+### Fixed
+- Fix broken array slicing inside `addcyclic` (PR [#559], solves issue
+ [#555], thanks to @fragkoul).
+- Fix `GeosLibrary` wrapper to also work with GEOS >= 3.7.0 on Windows
+ and GNU/Linux.
+- Fix wrong Antarctica coastline boundary with GEOS >= 3.9.0 (PR [#560],
+ solves issue [#522]).
+
 ## [1.3.4] - 2022-08-10
 
 ### Changed
@@ -924,6 +934,12 @@ https://semver.org/spec/v2.0.0.html
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#560]:
+https://github.com/matplotlib/basemap/pull/560
+[#559]:
+https://github.com/matplotlib/basemap/pull/559
+[#555]:
+https://github.com/matplotlib/basemap/issues/555
 [#548]:
 https://github.com/matplotlib/basemap/pull/548
 [#547]:
@@ -956,6 +972,8 @@ https://github.com/matplotlib/basemap/issues/527
 https://github.com/matplotlib/basemap/issues/526
 [#525]:
 https://github.com/matplotlib/basemap/issues/525
+[#522]:
+https://github.com/matplotlib/basemap/issues/522
 [#521]:
 https://github.com/matplotlib/basemap/issues/521
 [#518]:
@@ -1002,7 +1020,9 @@ https://github.com/matplotlib/basemap/issues/228
 https://github.com/matplotlib/basemap/issues/179
 
 [Unreleased]:
-https://github.com/matplotlib/basemap/compare/v1.3.4...develop
+https://github.com/matplotlib/basemap/compare/v1.3.5...develop
+[1.3.5]:
+https://github.com/matplotlib/basemap/compare/v1.3.4...v1.3.5
 [1.3.4]:
 https://github.com/matplotlib/basemap/compare/v1.3.3...v1.3.4
 [1.3.3]: