diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml index 85f1bbff5..7684d139f 100644 --- a/.github/workflows/basemap-for-manylinux.yml +++ b/.github/workflows/basemap-for-manylinux.yml @@ -223,6 +223,10 @@ jobs: with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist + - + name: Fix APT sources + run: | + sed -i 's|deb\.debian\.org|archive\.debian\.org|g' /etc/apt/sources.list - name: Install auditwheel run: | @@ -268,6 +272,10 @@ jobs: with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist + - + name: Fix APT sources + run: | + sed -i 's|deb\.debian\.org|archive\.debian\.org|g' /etc/apt/sources.list - name: Install numpy from source run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 604b0656e..1dd04705e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ https://keepachangelog.com/en/1.0.0/ https://semver.org/spec/v2.0.0.html +## [1.3.7] - 2023-05-04 + +### Changed +- Upgrade `numpy` upper pin to 1.25. +- Upgrade `matplotlib` upper pin to 3.8 (solves issue [#573]). +- Upgrade `pyproj` upper pin to 3.6. +- Upgrade test dependency `netCDF4` upper pin to 1.7. +- Upgrade test dependency `pillow` lower pin to 9.4. + ## [1.3.6] - 2022-10-31 ### Added @@ -948,6 +957,8 @@ https://semver.org/spec/v2.0.0.html - Fix glitches in drawing of parallels and meridians. +[#573]: +https://github.com/matplotlib/basemap/issues/573 [#564]: https://github.com/matplotlib/basemap/pull/564 [#563]: @@ -1040,7 +1051,9 @@ https://github.com/matplotlib/basemap/issues/228 https://github.com/matplotlib/basemap/issues/179 [Unreleased]: -https://github.com/matplotlib/basemap/compare/v1.3.6...develop +https://github.com/matplotlib/basemap/compare/v1.3.7...develop +[1.3.7]: +https://github.com/matplotlib/basemap/compare/v1.3.6...v1.3.7 [1.3.6]: https://github.com/matplotlib/basemap/compare/v1.3.5...v1.3.6 [1.3.5]: diff --git a/packages/basemap/README.md b/packages/basemap/README.md index 1e5efd8ca..4b408b7a0 100644 --- a/packages/basemap/README.md +++ b/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.3/packages/basemap/LICENSE +https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE [`LICENSE.geos`]: -https://github.com/matplotlib/basemap/blob/v1.3.3/packages/basemap/LICENSE.geos +https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE.geos diff --git a/packages/basemap/requirements-test.txt b/packages/basemap/requirements-test.txt index 6d37070de..1e4659b6a 100644 --- a/packages/basemap/requirements-test.txt +++ b/packages/basemap/requirements-test.txt @@ -19,7 +19,7 @@ pytest-cov >= 2.5, < 3.1; python_version >= "3.5" ordereddict; python_version == "2.6" netCDF4 >= 1.3, < 1.4; python_version < "3.6" -netCDF4 >= 1.3, < 1.5.6; python_version >= "3.6" +netCDF4 >= 1.3, < 1.7; python_version >= "3.6" pillow >= 3.4.0, < 4.0.0; python_version == "2.6" 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" pillow >= 5.4.0, < 6.0.0; python_version == "3.4" pillow >= 7.1.0, < 8.0.0; python_version == "3.5" pillow >= 8.3.2, < 9.0.0; python_version == "3.6" -pillow >= 9.0.1, < 10.0.0; python_version >= "3.7" +pillow >= 9.4.0, < 10.0.0; python_version >= "3.7" diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt index 91fbe93b7..5b4211b89 100644 --- a/packages/basemap/requirements.txt +++ b/packages/basemap/requirements.txt @@ -8,7 +8,7 @@ numpy >= 1.15, < 1.17; python_version == "3.4" numpy >= 1.16, < 1.19; python_version == "3.5" numpy >= 1.19, < 1.20; python_version == "3.6" numpy >= 1.21, < 1.22; python_version == "3.7" -numpy >= 1.22, < 1.24; python_version >= "3.8" +numpy >= 1.22, < 1.25; python_version >= "3.8" cycler < 0.11; python_version == "3.2" pyparsing >= 1.5, < 2.4.1; python_version == "2.6" @@ -18,14 +18,14 @@ matplotlib >= 1.5, < 3.0; python_version == "2.7" matplotlib >= 1.5, < 2.0; python_version == "3.2" matplotlib >= 1.5, < 2.0; python_version == "3.3" matplotlib >= 1.5, < 3.0; python_version == "3.4" -matplotlib >= 1.5, < 3.7; python_version >= "3.5" +matplotlib >= 1.5, < 3.8; python_version >= "3.5" pyproj >= 1.9.3, < 2.1.0; python_version == "2.6" pyproj >= 1.9.3, < 2.3.0; python_version == "2.7" pyproj >= 1.9.3, < 1.9.6; python_version == "3.2" pyproj >= 1.9.3, < 2.1.0; python_version == "3.3" pyproj >= 1.9.3, < 2.1.0; python_version == "3.4" -pyproj >= 1.9.3, < 3.5.0; python_version >= "3.5" +pyproj >= 1.9.3, < 3.6.0; python_version >= "3.5" pyshp >= 1.2, < 2.0; python_version == "2.6" pyshp >= 1.2, < 2.4; python_version >= "2.7" diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py index 43698876c..69b23963c 100644 --- a/packages/basemap/setup.py +++ b/packages/basemap/setup.py @@ -172,7 +172,7 @@ def run(self): "name": "basemap", "version": - "1.3.6", + "1.3.7", "license": "MIT", "description": diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py index 8f5022c86..f09e16f42 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py +++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py @@ -54,7 +54,7 @@ import functools -__version__ = "1.3.6" +__version__ = "1.3.7" # basemap data files now installed in lib/matplotlib/toolkits/basemap/data # check to see if environment variable BASEMAPDATA set to a directory, diff --git a/packages/basemap/src/mpl_toolkits/basemap/proj.py b/packages/basemap/src/mpl_toolkits/basemap/proj.py index 9a56dacc8..7c733bbb4 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/proj.py +++ b/packages/basemap/src/mpl_toolkits/basemap/proj.py @@ -11,7 +11,7 @@ from matplotlib.cbook import dedent -__version__ = "1.3.6" +__version__ = "1.3.7" _dg2rad = math.radians(1.) _rad2dg = math.degrees(1.)