Skip to content

Commit c20c146

Browse files
molinavmolinav
committed
Merge branch 'hotfix-1.3.8'
2 parents 2986338 + d42510d commit c20c146

17 files changed

+100
-64
lines changed

Diff for: ‎.github/workflows/basemap-data-hires.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
PKGDIR: "packages/basemap_data_hires"
55
PYTHONWARNINGS: "ignore:DEPRECATION"
66
PIP_DISABLE_PIP_VERSION_CHECK: 1
7+
PIP_PREFER_BINARY: 1
78
PIP_TIMEOUT: 10
89
PIP_RETRIES: 0
910

@@ -114,9 +115,9 @@ jobs:
114115
name: artifacts-build
115116
path: ${{ env.PKGDIR }}/dist
116117
-
117-
name: Install requirements
118+
name: Install upload requirements
118119
run: |
119-
pip install --prefer-binary twine
120+
pip install twine
120121
-
121122
name: Upload distributables
122123
env:

Diff for: ‎.github/workflows/basemap-data.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
PKGDIR: "packages/basemap_data"
55
PYTHONWARNINGS: "ignore:DEPRECATION"
66
PIP_DISABLE_PIP_VERSION_CHECK: 1
7+
PIP_PREFER_BINARY: 1
78
PIP_TIMEOUT: 10
89
PIP_RETRIES: 0
910

@@ -114,9 +115,9 @@ jobs:
114115
name: artifacts-build
115116
path: ${{ env.PKGDIR }}/dist
116117
-
117-
name: Install requirements
118+
name: Install upload requirements
118119
run: |
119-
pip install --prefer-binary twine
120+
pip install twine
120121
-
121122
name: Upload distributables
122123
env:

Diff for: ‎.github/workflows/basemap-for-manylinux.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
PKGDIR: "packages/basemap"
55
PYTHONWARNINGS: "ignore:DEPRECATION"
66
PIP_DISABLE_PIP_VERSION_CHECK: 1
7+
PIP_PREFER_BINARY: 1
78
PIP_TIMEOUT: 10
89
PIP_RETRIES: 0
910

@@ -59,7 +60,7 @@ jobs:
5960
name: Install library requirements
6061
run: |
6162
cd ${{ env.PKGDIR }}
62-
pip install --prefer-binary -r requirements.txt
63+
pip install -r requirements.txt
6364
-
6465
name: Run Flake8
6566
run: |
@@ -186,7 +187,7 @@ jobs:
186187
export NUMPY_INCLUDE_PATH=${sitepkgdir}/numpy/core/include
187188
if [ "${{ matrix.python-version }}" = "3.11" ]; then
188189
kwds="--no-build-isolation"
189-
pip install setuptools wheel "cython >= 0.29, < 3.1"
190+
pip install setuptools wheel "cython >= 0.29, < 3.0"
190191
fi
191192
cd ${{ env.PKGDIR }}
192193
python setup.py sdist
@@ -223,10 +224,6 @@ jobs:
223224
with:
224225
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
225226
path: ${{ env.PKGDIR }}/dist
226-
-
227-
name: Fix APT sources
228-
run: |
229-
sed -i 's|deb\.debian\.org|archive\.debian\.org|g' /etc/apt/sources.list
230227
-
231228
name: Install auditwheel
232229
run: |
@@ -272,10 +269,6 @@ jobs:
272269
with:
273270
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
274271
path: ${{ env.PKGDIR }}/dist
275-
-
276-
name: Fix APT sources
277-
run: |
278-
sed -i 's|deb\.debian\.org|archive\.debian\.org|g' /etc/apt/sources.list
279272
-
280273
name: Install numpy from source
281274
run: |
@@ -286,7 +279,7 @@ jobs:
286279
-
287280
name: Install package
288281
run: |
289-
pip install --prefer-binary ${{ env.PKGDIR }}/dist/*-manylinux1*.whl
282+
pip install ${{ env.PKGDIR }}/dist/*-manylinux1*.whl
290283
-
291284
name: Test package
292285
run: |
@@ -314,9 +307,9 @@ jobs:
314307
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
315308
path: ${{ env.PKGDIR }}/dist
316309
-
317-
name: Install requirements
310+
name: Install upload requirements
318311
run: |
319-
pip install --prefer-binary twine
312+
pip install twine
320313
-
321314
name: Upload distributables
322315
env:

Diff for: ‎.github/workflows/basemap-for-windows.yml

+16-15
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
PKGDIR: "packages/basemap"
55
PYTHONWARNINGS: "ignore:DEPRECATION"
66
PIP_DISABLE_PIP_VERSION_CHECK: 1
7+
PIP_PREFER_BINARY: 1
78
PIP_TIMEOUT: 10
89
PIP_RETRIES: 0
910

@@ -51,7 +52,7 @@ jobs:
5152
path: .
5253
-
5354
name: Set Python
54-
uses: actions/setup-python@v4
55+
uses: pylegacy/actions/setup-pyenv-win@v2
5556
with:
5657
architecture: ${{ matrix.arch }}
5758
python-version: ${{ matrix.python-version }}
@@ -68,7 +69,7 @@ jobs:
6869
name: Install library requirements
6970
run: |
7071
cd ${{ env.PKGDIR }}
71-
pip install --prefer-binary -r requirements.txt
72+
python -m pip install -r requirements.txt
7273
-
7374
name: Run Flake8
7475
run: |
@@ -117,7 +118,7 @@ jobs:
117118
cmake-version: "3.14.7"
118119
-
119120
name: Set Python
120-
uses: actions/setup-python@v4
121+
uses: pylegacy/actions/setup-pyenv-win@v2
121122
with:
122123
architecture: ${{ matrix.arch }}
123124
python-version: "3.6"
@@ -167,7 +168,7 @@ jobs:
167168
version: ${{ env.msvc-toolset }}
168169
-
169170
name: Set Python
170-
uses: actions/setup-python@v4
171+
uses: pylegacy/actions/setup-pyenv-win@v2
171172
with:
172173
architecture: ${{ matrix.arch }}
173174
python-version: ${{ matrix.python-version }}
@@ -197,9 +198,9 @@ jobs:
197198
run: |
198199
cd ${{ env.PKGDIR }}
199200
$env:GEOS_DIR = "$env:GITHUB_WORKSPACE/${{ env.PKGDIR }}/extern"
200-
pip install -r requirements-setup.txt
201+
python -m pip install -r requirements-setup.txt
201202
python setup.py sdist
202-
pip wheel -w dist --no-deps (Get-Item dist/*.zip)
203+
python -m pip wheel -w dist --no-deps (Get-Item dist/*.zip)
203204
-
204205
name: Upload build artifacts
205206
uses: actions/upload-artifact@v1
@@ -221,10 +222,14 @@ jobs:
221222
steps:
222223
-
223224
name: Set Python
224-
uses: actions/setup-python@v4
225+
uses: pylegacy/actions/setup-pyenv-win@v2
225226
with:
226227
architecture: ${{ matrix.arch }}
227228
python-version: ${{ matrix.python-version }}
229+
-
230+
name: Set Python base packages
231+
run: |
232+
python -m pip install --upgrade pip setuptools wheel
228233
-
229234
name: Download build artifacts
230235
uses: actions/download-artifact@v1
@@ -234,16 +239,12 @@ jobs:
234239
-
235240
name: Install package
236241
run: |
237-
pip install --prefer-binary (Get-Item ${{ env.PKGDIR }}/dist/*-win*.whl)
238-
# We need to skip Py311 x86 because of missing pyproj wheels.
239-
if: matrix.arch != 'x86' || matrix.python-version != '3.11'
242+
python -m pip install (Get-Item ${{ env.PKGDIR }}/dist/*-win*.whl)
240243
-
241244
name: Test package
242245
run: |
243246
python -c "from mpl_toolkits.basemap import Basemap"
244247
python -c "from mpl_toolkits.basemap import cm"
245-
# We need to skip Py311 x86 because of missing pyproj wheels.
246-
if: matrix.arch != 'x86' || matrix.python-version != '3.11'
247248
248249
upload:
249250
strategy:
@@ -260,7 +261,7 @@ jobs:
260261
steps:
261262
-
262263
name: Set Python
263-
uses: actions/setup-python@v4
264+
uses: pylegacy/actions/setup-pyenv-win@v2
264265
with:
265266
architecture: ${{ matrix.arch }}
266267
python-version: ${{ matrix.python-version }}
@@ -271,9 +272,9 @@ jobs:
271272
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
272273
path: ${{ env.PKGDIR }}/dist
273274
-
274-
name: Install requirements
275+
name: Install upload requirements
275276
run: |
276-
pip install --prefer-binary twine
277+
python -m pip install twine
277278
-
278279
name: Upload distributables
279280
env:

Diff for: ‎CHANGELOG.md

+32-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,25 @@ https://keepachangelog.com/en/1.0.0/
1010
https://semver.org/spec/v2.0.0.html
1111

1212

13+
## [1.3.8] - 2023-08-18
14+
15+
### Changed
16+
- Upgrade `numpy` upper pin to 1.26.
17+
- Upgrade `pyproj` upper pin to 3.7.
18+
- Upgrade optional `pillow` upper pin to 10.1.0.
19+
- Upgrade documentation and linting dependencies.
20+
21+
### Fixed
22+
- Fix Cygwin build error due to GCC passing `"--enable-new-dtags"` to
23+
the linker (PR [#582] by @DWesl, solves issue [#579]).
24+
- Fix deprecated `Image.ANTIALIAS` with `Image.LANCZOS` when `pillow`
25+
version is at least 10.0.0 (PR [#580] by @cgohlke).
26+
- Downgrade upper pin for Cython requirement from 3.1 to 3.0 due to
27+
build error triggered by `_geoslib.pyx` (solves issues [#581] and
28+
[#583]).
29+
- Downgrade `numpy` lower pin to `numpy >= 1.21` for Python >= 3.8,
30+
whose upgrade is delayed until `basemap` 1.4.0.
31+
1332
## [1.3.7] - 2023-05-04
1433

1534
### Changed
@@ -957,6 +976,16 @@ https://semver.org/spec/v2.0.0.html
957976
- Fix glitches in drawing of parallels and meridians.
958977

959978

979+
[#583]:
980+
https://github.com/matplotlib/basemap/issues/583
981+
[#582]:
982+
https://github.com/matplotlib/basemap/pull/582
983+
[#581]:
984+
https://github.com/matplotlib/basemap/issues/581
985+
[#580]:
986+
https://github.com/matplotlib/basemap/pull/580
987+
[#579]:
988+
https://github.com/matplotlib/basemap/issues/579
960989
[#573]:
961990
https://github.com/matplotlib/basemap/issues/573
962991
[#564]:
@@ -1051,7 +1080,9 @@ https://github.com/matplotlib/basemap/issues/228
10511080
https://github.com/matplotlib/basemap/issues/179
10521081

10531082
[Unreleased]:
1054-
https://github.com/matplotlib/basemap/compare/v1.3.7...develop
1083+
https://github.com/matplotlib/basemap/compare/v1.3.8...develop
1084+
[1.3.8]:
1085+
https://github.com/matplotlib/basemap/compare/v1.3.7...v1.3.8
10551086
[1.3.7]:
10561087
https://github.com/matplotlib/basemap/compare/v1.3.6...v1.3.7
10571088
[1.3.6]:

Diff for: ‎packages/basemap/.pylintrc

+8-11
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@ disable=
7676
assignment-from-none,
7777
# Allow freedom with error raises.
7878
raise-missing-from,
79-
# Allow freedom with string formatting.
80-
consider-using-f-string
79+
# Allow freedom with using lambda functions.
80+
unnecessary-lambda-assignment,
81+
# Allow freedom with old ways of using basic types.
82+
consider-using-f-string,
83+
use-dict-literal
8184

8285
# Enable the message, report, category or checker with the given id(s). You can
8386
# either give multiple identifier separated by comma (,) or put this option
@@ -251,12 +254,6 @@ max-line-length=99
251254
# Maximum number of lines in a module.
252255
max-module-lines=999
253256

254-
# List of optional constructs for which whitespace checking is disabled. `dict-
255-
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
256-
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
257-
# `empty-line` allows space-only lines.
258-
no-space-check=dict-separator
259-
260257
# Allow the body of a class to be on the same line as the declaration if body
261258
# contains single statement.
262259
single-line-class-stmt=no
@@ -519,6 +516,6 @@ preferred-modules=
519516
[EXCEPTIONS]
520517

521518
# Exceptions that will emit a warning when being caught. Defaults to
522-
# "BaseException, Exception".
523-
overgeneral-exceptions=BaseException,
524-
Exception
519+
# "builtins.BaseException, builtins.Exception".
520+
overgeneral-exceptions=builtins.BaseException,
521+
builtins.Exception

Diff for: ‎packages/basemap/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ https://spdx.org/licenses/LGPL-2.1-only.html
4545
https://spdx.org/licenses/MIT.html
4646

4747
[`LICENSE`]:
48-
https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE
48+
https://github.com/matplotlib/basemap/blob/v1.3.8/packages/basemap/LICENSE
4949
[`LICENSE.geos`]:
50-
https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE.geos
50+
https://github.com/matplotlib/basemap/blob/v1.3.8/packages/basemap/LICENSE.geos

Diff for: ‎packages/basemap/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ requires = [
88
'numpy == 1.16.6; sys_platform != "darwin" and (python_version >= "3.7" and python_version <= "3.9")',
99
'numpy == 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.6")',
1010
'numpy == 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
11-
'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"',
11+
'cython >= 0.29, < 3.0; python_version >= "3.3" or python_version < "3.0"',
1212
'cython >= 0.26, < 0.27; python_version == "3.2"'
1313
]
1414
build-backend = "setuptools.build_meta"

Diff for: ‎packages/basemap/requirements-doc.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
sphinx >= 3.0, < 5.0; python_version >= "3.6"
1+
sphinx >= 5.3, < 6.3; python_version >= "3.6"
2+
furo >= 2022.4.7, < 2023.5.21; python_version >= "3.6"

Diff for: ‎packages/basemap/requirements-lint.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ flake8 >= 2.6, < 4.0; python_version == "2.7"
55
flake8 >= 2.6, < 3.0; python_version == "3.2"
66
flake8 >= 2.6, < 3.0; python_version == "3.3"
77
flake8 >= 2.6, < 3.9; python_version == "3.4"
8-
flake8 >= 2.6, < 4.1; python_version >= "3.5"
8+
flake8 >= 2.6, < 7.1; python_version >= "3.5"
99

1010
astroid >= 1.6, < 2.0; python_version == "2.7"
11-
astroid >= 2.4, < 3.0; python_version >= "3.5"
11+
astroid >= 2.4, < 2.5; python_version == "3.5"
12+
astroid >= 2.5, < 2.7; python_version == "3.6"
13+
astroid >= 2.8, < 3.0; python_version >= "3.7"
1214
pylint >= 1.9, < 2.0; python_version == "2.7"
13-
pylint >= 2.6, < 3.0; python_version >= "3.5"
15+
pylint >= 2.6, < 2.7; python_version == "3.5"
16+
pylint >= 2.7, < 2.10; python_version == "3.6"
17+
pylint >= 2.11, < 3.0; python_version >= "3.7"

Diff for: ‎packages/basemap/requirements-setup.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
cython >= 0.29, < 3.0; python_version == "2.6"
22
cython >= 0.29, < 3.0; python_version == "2.7"
33
cython >= 0.26, < 0.27; python_version == "3.2"
4-
cython >= 0.29, < 3.0; python_version == "3.3"
5-
cython >= 0.29, < 3.0; python_version == "3.4"
6-
cython >= 0.29, < 3.1; python_version >= "3.5"
4+
cython >= 0.29, < 3.0; python_version >= "3.3"

Diff for: ‎packages/basemap/requirements-test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ pillow >= 4.3.0, < 5.0.0; python_version == "3.3"
2828
pillow >= 5.4.0, < 6.0.0; python_version == "3.4"
2929
pillow >= 7.1.0, < 8.0.0; python_version == "3.5"
3030
pillow >= 8.3.2, < 9.0.0; python_version == "3.6"
31-
pillow >= 9.4.0, < 10.0.0; python_version >= "3.7"
31+
pillow >= 9.4.0, < 10.1.0; python_version >= "3.7"

Diff for: ‎packages/basemap/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ numpy >= 1.15, < 1.17; python_version == "3.4"
88
numpy >= 1.16, < 1.19; python_version == "3.5"
99
numpy >= 1.19, < 1.20; python_version == "3.6"
1010
numpy >= 1.21, < 1.22; python_version == "3.7"
11-
numpy >= 1.22, < 1.25; python_version >= "3.8"
11+
numpy >= 1.21, < 1.26; python_version >= "3.8"
1212

1313
cycler < 0.11; python_version == "3.2"
1414
pyparsing >= 1.5, < 2.4.1; python_version == "2.6"
@@ -25,7 +25,7 @@ pyproj >= 1.9.3, < 2.3.0; python_version == "2.7"
2525
pyproj >= 1.9.3, < 1.9.6; python_version == "3.2"
2626
pyproj >= 1.9.3, < 2.1.0; python_version == "3.3"
2727
pyproj >= 1.9.3, < 2.1.0; python_version == "3.4"
28-
pyproj >= 1.9.3, < 3.6.0; python_version >= "3.5"
28+
pyproj >= 1.9.3, < 3.7.0; python_version >= "3.5"
2929

3030
pyshp >= 1.2, < 2.0; python_version == "2.6"
3131
pyshp >= 1.2, < 2.4; python_version >= "2.7"

0 commit comments

Comments
 (0)