Skip to content

Commit 2986338

Browse files
committed
Merge branch 'hotfix-1.3.7'
2 parents 974e092 + 594a519 commit 2986338

File tree

8 files changed

+32
-11
lines changed

8 files changed

+32
-11
lines changed

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

+8
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ jobs:
223223
with:
224224
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
225225
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
226230
-
227231
name: Install auditwheel
228232
run: |
@@ -268,6 +272,10 @@ jobs:
268272
with:
269273
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
270274
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
271279
-
272280
name: Install numpy from source
273281
run: |

CHANGELOG.md

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

1212

13+
## [1.3.7] - 2023-05-04
14+
15+
### Changed
16+
- Upgrade `numpy` upper pin to 1.25.
17+
- Upgrade `matplotlib` upper pin to 3.8 (solves issue [#573]).
18+
- Upgrade `pyproj` upper pin to 3.6.
19+
- Upgrade test dependency `netCDF4` upper pin to 1.7.
20+
- Upgrade test dependency `pillow` lower pin to 9.4.
21+
1322
## [1.3.6] - 2022-10-31
1423

1524
### Added
@@ -948,6 +957,8 @@ https://semver.org/spec/v2.0.0.html
948957
- Fix glitches in drawing of parallels and meridians.
949958

950959

960+
[#573]:
961+
https://github.com/matplotlib/basemap/issues/573
951962
[#564]:
952963
https://github.com/matplotlib/basemap/pull/564
953964
[#563]:
@@ -1040,7 +1051,9 @@ https://github.com/matplotlib/basemap/issues/228
10401051
https://github.com/matplotlib/basemap/issues/179
10411052

10421053
[Unreleased]:
1043-
https://github.com/matplotlib/basemap/compare/v1.3.6...develop
1054+
https://github.com/matplotlib/basemap/compare/v1.3.7...develop
1055+
[1.3.7]:
1056+
https://github.com/matplotlib/basemap/compare/v1.3.6...v1.3.7
10441057
[1.3.6]:
10451058
https://github.com/matplotlib/basemap/compare/v1.3.5...v1.3.6
10461059
[1.3.5]:

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.3/packages/basemap/LICENSE
48+
https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE
4949
[`LICENSE.geos`]:
50-
https://github.com/matplotlib/basemap/blob/v1.3.3/packages/basemap/LICENSE.geos
50+
https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE.geos

packages/basemap/requirements-test.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pytest-cov >= 2.5, < 3.1; python_version >= "3.5"
1919

2020
ordereddict; python_version == "2.6"
2121
netCDF4 >= 1.3, < 1.4; python_version < "3.6"
22-
netCDF4 >= 1.3, < 1.5.6; python_version >= "3.6"
22+
netCDF4 >= 1.3, < 1.7; python_version >= "3.6"
2323

2424
pillow >= 3.4.0, < 4.0.0; python_version == "2.6"
2525
pillow >= 6.2.2, < 7.0.0; python_version == "2.7"
@@ -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.0.1, < 10.0.0; python_version >= "3.7"
31+
pillow >= 9.4.0, < 10.0.0; python_version >= "3.7"

packages/basemap/requirements.txt

+3-3
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.24; python_version >= "3.8"
11+
numpy >= 1.22, < 1.25; python_version >= "3.8"
1212

1313
cycler < 0.11; python_version == "3.2"
1414
pyparsing >= 1.5, < 2.4.1; python_version == "2.6"
@@ -18,14 +18,14 @@ matplotlib >= 1.5, < 3.0; python_version == "2.7"
1818
matplotlib >= 1.5, < 2.0; python_version == "3.2"
1919
matplotlib >= 1.5, < 2.0; python_version == "3.3"
2020
matplotlib >= 1.5, < 3.0; python_version == "3.4"
21-
matplotlib >= 1.5, < 3.7; python_version >= "3.5"
21+
matplotlib >= 1.5, < 3.8; python_version >= "3.5"
2222

2323
pyproj >= 1.9.3, < 2.1.0; python_version == "2.6"
2424
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.5.0; python_version >= "3.5"
28+
pyproj >= 1.9.3, < 3.6.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"

packages/basemap/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def run(self):
172172
"name":
173173
"basemap",
174174
"version":
175-
"1.3.6",
175+
"1.3.7",
176176
"license":
177177
"MIT",
178178
"description":

packages/basemap/src/mpl_toolkits/basemap/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import functools
5555

5656

57-
__version__ = "1.3.6"
57+
__version__ = "1.3.7"
5858

5959
# basemap data files now installed in lib/matplotlib/toolkits/basemap/data
6060
# check to see if environment variable BASEMAPDATA set to a directory,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from matplotlib.cbook import dedent
1212

1313

14-
__version__ = "1.3.6"
14+
__version__ = "1.3.7"
1515

1616
_dg2rad = math.radians(1.)
1717
_rad2dg = math.degrees(1.)

0 commit comments

Comments
 (0)